diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-07 15:11:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-07 15:11:10 -0400 |
| commit | bc29af157a7ea69ff8e197a7d3134cbe33ae707e (patch) | |
| tree | 2714bbdecf36eb908409e3db773489a3178648ee | |
| parent | c10bf022f6c48549fad75164160820e7981b9c34 (diff) | |
subshells for cd &&
| -rwxr-xr-x | standalone/android/buildapk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/standalone/android/buildapk b/standalone/android/buildapk index 7b3d0c0be..4c50cacf0 100755 --- a/standalone/android/buildapk +++ b/standalone/android/buildapk @@ -80,7 +80,7 @@ perl -i -pe 's/(android:versionName=)"[^"]+"/$1"'"$VER"'"/' \ "$GIT_ANNEX_ANDROID_SOURCETREE/term/AndroidManifest.xml" # Debug build because it does not need signing keys. -cd "$GIT_ANNEX_ANDROID_SOURCETREE/term" && tools/build-debug +(cd "$GIT_ANNEX_ANDROID_SOURCETREE/term" && tools/build-debug) # Install executables as pseudo-libraries so they will be # unpacked from the .apk. @@ -119,12 +119,12 @@ rm -rf $gittree/bin/git-cvsserver \ # commands are still shell scripts. Those are put into # a tarball, along with a list of all the links that should be # set up. -cd $gittree && mkdir -p links -cd $gittree && find -samefile bin/git -not -wholename ./bin/git > links/git -cd $gittree && find -samefile bin/git-shell -not -wholename ./bin/git-shell > links/git-shell -cd $gittree && find -samefile bin/git-upload-pack -not -wholename ./bin/git-upload-pack > links/git-upload-pack -cd $gittree && find -type f -not -samefile bin/git -not -samefile bin/git-shell -not -samefile bin/git-upload-pack | tar czf ../git.tar.gz -T - -cp "$GIT_ANNEX_ANDROID_SOURCETREE/git/git.tar.gz" "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.git.tar.gz.so" +(cd $gittree && mkdir -p links) +(cd $gittree && find -samefile bin/git -not -wholename ./bin/git > links/git) +(cd $gittree && find -samefile bin/git-shell -not -wholename ./bin/git-shell > links/git-shell) +(cd $gittree && find -samefile bin/git-upload-pack -not -wholename ./bin/git-upload-pack > links/git-upload-pack) +(cd $gittree && find -type f -not -samefile bin/git -not -samefile bin/git-shell -not -samefile bin/git-upload-pack | tar czf ../git.tar.gz -T -) +(cp "$GIT_ANNEX_ANDROID_SOURCETREE/git/git.tar.gz" "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.git.tar.gz.so") git rev-parse HEAD > "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.version.so" cp ../trustedkeys.gpg "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.trustedkeys.so" @@ -133,7 +133,7 @@ genapk () { mkdir -p ../../tmp/$1; \ cp ../../tmp/androidtree/dist/build/git-annex/$1/git-annex "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.git-annex.so" arm-linux-androideabi-strip --strip-unneeded --remove-section=.comment --remove-section=.note "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.git-annex.so" - cd "$GIT_ANNEX_ANDROID_SOURCETREE/term" && ant debug + (cd "$GIT_ANNEX_ANDROID_SOURCETREE/term" && ant debug) cp "$GIT_ANNEX_ANDROID_SOURCETREE/term/bin/Term-debug.apk" ../../tmp/$1/git-annex.apk } |