widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #15233
[Merge] lp:~widelands-dev/widelands/bug-1800814-update-script into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1800814-update-script into lp:widelands.
Commit message:
Copy the version file instead of moving it, so that the update script can be run twice in a row.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1800814 in widelands: "update.sh script broken since at least bzr8903[trunk]"
https://bugs.launchpad.net/widelands/+bug/1800814
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1800814-update-script/+merge/358419
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800814-update-script into lp:widelands.
=== modified file 'compile.sh'
--- compile.sh 2018-10-30 14:04:11 +0000
+++ compile.sh 2018-11-07 06:36:36 +0000
@@ -212,7 +212,7 @@
rm -f ../wl_map_object_info || true
rm -f ../wl_map_info || true
- mv VERSION ../VERSION
+ cp VERSION ../VERSION
mv src/widelands ../widelands
if [ $BUILD_WEBSITE = "ON" ]; then
@@ -249,7 +249,7 @@
$buildtool
rm ../VERSION || true
rm ../widelands || true
-mv VERSION ../VERSION
+cp VERSION ../VERSION
mv src/widelands ../widelands
cd ..
Follow ups