mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

subshells for cd &&

Browse source
This commit is contained in:
Joey Hess 2015-01-07 15:11:10 -04:00
parent 0ca73b51b6
commit fc6506b041
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
standalone/android/buildapk
View file

@ -80,7 +80,7 @@ perl -i -pe 's/(android:versionName=)"[^"]+"/$1"'"$VER"'"/' \
"$GIT_ANNEX_ANDROID_SOURCETREE/term/AndroidManifest.xml" "$GIT_ANNEX_ANDROID_SOURCETREE/term/AndroidManifest.xml"
# Debug build because it does not need signing keys. # 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 # Install executables as pseudo-libraries so they will be
# unpacked from the .apk. # unpacked from the .apk.
@ -119,12 +119,12 @@ rm -rf $gittree/bin/git-cvsserver \
# commands are still shell scripts. Those are put into # commands are still shell scripts. Those are put into
# a tarball, along with a list of all the links that should be # a tarball, along with a list of all the links that should be
# set up. # set up.
cd $gittree && mkdir -p links (cd $gittree && mkdir -p links)
cd $gittree && find -samefile bin/git -not -wholename ./bin/git > links/git (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-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 -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 - (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" (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" 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" cp ../trustedkeys.gpg "$GIT_ANNEX_ANDROID_SOURCETREE/term/libs/armeabi/lib.trustedkeys.so"
@ -133,7 +133,7 @@ genapk () {
mkdir -p ../../tmp/$1; \ 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" 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" 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 cp "$GIT_ANNEX_ANDROID_SOURCETREE/term/bin/Term-debug.apk" ../../tmp/$1/git-annex.apk
} }