Browse code

0.9.8 brings more Linux fixes

Nat! authored on 17-10-2015 01:01:04
Showing 4 changed files
... ...
@@ -13,15 +13,17 @@ echo "#" > /dev/null
13 13
 echo "# clone mulle-bootstrap from www.mulle-kybernetik.com" > /dev/null
14 14
 echo "#" > /dev/null
15 15
 
16
-git clone /Volumes/Source/srcM/mulle-bootstrap
17
-# git clone http://www.mulle-kybernetik.com/repositories/mulle-bootstrap
16
+#git clone /Volumes/Source/srcM/mulle-bootstrap
17
+git clone http://www.mulle-kybernetik.com/repositories/mulle-bootstrap
18 18
 
19 19
 echo "#" > /dev/null
20 20
 echo "# now install it, you can install it with itself, but you get" > /dev/null
21 21
 echo "# the developer environment too, which you may not want for now" > /dev/null
22 22
 echo "#" > /dev/null
23 23
 cd mulle-bootstrap
24
-./install.sh
24
+./install.sh /tmp
25
+PATH=/tmp/bin:$PATH
26
+
25 27
 set +e
26 28
 mulle-bootstrap -h
27 29
 set -e
... ...
@@ -29,7 +29,7 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 
32
-VERSION=0.9.7
32
+VERSION=0.9.8
33 33
 
34 34
 #
35 35
 # This is the main user interface to mulle-bootstrap
... ...
@@ -85,11 +85,11 @@ dispense_headers()
85 85
          mkdir_if_missing "${dst}"
86 86
 
87 87
          log_fluff "Copying ${C_RESET}${src}${C_FLUFF} to ${C_RESET}${dst}${C_FLUFF}"
88
-         exekutor find -x "${src}" ! -path "${src}" -mindepth 1 -maxdepth 1 -type d -print0 | \
89
-            exekutor xargs -0 -J % mv ${COPYMOVEFLAGS} -n % "${dst}"
88
+         exekutor find -xdev "${src}" -mindepth 1 -maxdepth 1 ! -path "${src}" -type d -print0 | \
89
+            exekutor xargs -0 -I % mv ${COPYMOVEFLAGS} -n % "${dst}"
90 90
          [ $? -eq 0 ]  || exit 1
91
-         exekutor find -x "${src}" ! -path "${src}" -mindepth 1 -maxdepth 1 \( -type f -o -type l \) -print0 | \
92
-            exekutor xargs -0 -J % mv ${COPYMOVEFLAGS} -n % "${dst}"
91
+         exekutor find -xdev "${src}" -mindepth 1 -maxdepth 1 ! -path "${src}" \( -type f -o -type l \) -print0 | \
92
+            exekutor xargs -0 -I % mv ${COPYMOVEFLAGS} -n % "${dst}"
93 93
          [ $? -eq 0 ]  || exit 1
94 94
 
95 95
          rmdir_safer "${src}"
... ...
@@ -130,8 +130,8 @@ dispense_binaries()
130 130
 
131 131
          log_fluff "Copying ${C_RESET}${src}${C_FLUFF} to ${C_RESET}${dst}${C_FLUFF}"
132 132
          mkdir_if_missing "${dst}"
133
-         exekutor find -x "${src}" ! -path "${src}" \( -type "${findtype}" -o -type "${findtype2}" \) -mindepth 1 -maxdepth 1 -print0 | \
134
-            exekutor xargs -0 -J % mv ${COPYMOVEFLAGS} -n % "${dst}"
133
+         exekutor find -xdev "${src}" -mindepth 1 -maxdepth 1 ! -path "${src}" \( -type "${findtype}" -o -type "${findtype2}" \) -print0 | \
134
+            exekutor xargs -0 -I % mv ${COPYMOVEFLAGS} -n % "${dst}"
135 135
          [ $? -eq 0 ]  || exit 1
136 136
       else
137 137
          log_fluff "But threre are none"
... ...
@@ -248,8 +248,8 @@ collect_and_dispense_product()
248 248
          dst="${REFERENCE_DEPENDENCY_SUBDIR}${usrlocal}"
249 249
 
250 250
          log_fluff "Copying everything from ${C_RESET}${src}${C_FLUFF} to ${C_RESET}${dst}${C_FLUFF}"
251
-         exekutor find -x "${src}" ! -path "${src}" -mindepth 1 -maxdepth 1 -print0 | \
252
-               exekutor xargs -0 -J % mv -v -n % "${dst}"
251
+         exekutor find -xdev "${src}" -mindepth 1 -maxdepth 1 ! -path "${src}" -print0 | \
252
+               exekutor xargs -0 -I % mv -v -n % "${dst}"
253 253
          [ $? -eq 0 ]  || fail "moving files from ${src} to ${dst} failed"
254 254
       fi
255 255
 
... ...
@@ -503,7 +503,7 @@ bootstrap_auto_update()
503 503
 
504 504
       # flatten other folders into our own settings
505 505
       # don't force though, keep first
506
-      exekutor find "${dst}/.bootstrap/settings" ! -name bin -type d -mindepth 1 -maxdepth 1 -print0 | \
506
+      exekutor find "${dst}/.bootstrap/settings" -mindepth 1 -maxdepth 1 ! -name bin -type d -print0 | \
507 507
          exekutor xargs -0 -I % ln -s "${relative}/../"% "${BOOTSTRAP_SUBDIR}.auto/settings"
508 508
    fi
509 509