widelands

Merge lp:~widelands-dev/widelands/bug-1800814-update-script into lp:widelands

  1. bug-1800814-update-script
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8907
Proposed branch: lp:~widelands-dev/widelands/bug-1800814-update-script
Merge into: lp:widelands
Diff against target: 20 lines (+2/-2)
1 file modified
compile.sh (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1800814-update-script
Reviewer Review Type Date Requested Status
Klaus Halfmann compile.ch / 2 x update.sh Approve
Review via email: mp+358419@code.launchpad.net

Commit message

Copy the version file instead of moving it, so that the update script can be run twice in a row.

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Had to manully inject code from number_of_cpus branch.

code is straight foreward.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Works as desigends, lets have it.

@bunnybot merge

review: Approve (compile.ch / 2 x update.sh)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compile.sh'
2--- compile.sh 2018-10-30 14:04:11 +0000
3+++ compile.sh 2018-11-07 06:36:36 +0000
4@@ -212,7 +212,7 @@
5 rm -f ../wl_map_object_info || true
6 rm -f ../wl_map_info || true
7
8- mv VERSION ../VERSION
9+ cp VERSION ../VERSION
10 mv src/widelands ../widelands
11
12 if [ $BUILD_WEBSITE = "ON" ]; then
13@@ -249,7 +249,7 @@
14 $buildtool
15 rm ../VERSION || true
16 rm ../widelands || true
17-mv VERSION ../VERSION
18+cp VERSION ../VERSION
19 mv src/widelands ../widelands
20 cd ..
21

Subscribers

People subscribed via source and target branches

to status/vote changes: