diff options
| author | Ladios Jonquil <ladios.jonquil@gmail.com> | 2011-09-25 02:11:08 +0800 |
|---|---|---|
| committer | Ladios Jonquil <ladios.jonquil@gmail.com> | 2011-09-25 02:16:41 +0800 |
| commit | 1f7651389790a223bf0120e4931b38c43e422162 (patch) | |
| tree | 05fa43c45b6c92bcc4b87dbe14b2f3c0ac69662c /tools | |
| parent | ca5ec926ae342f3de4e48114b03b50c0480daa29 (diff) | |
| download | vendor_replicant-1f7651389790a223bf0120e4931b38c43e422162.tar.gz vendor_replicant-1f7651389790a223bf0120e4931b38c43e422162.tar.bz2 vendor_replicant-1f7651389790a223bf0120e4931b38c43e422162.zip | |
tools: Fix for $LOGNAME missing in Ubuntu 11.10, using $USER instead
Change-Id: I824fc6ca27c2a2308e977a14585afc6dd4996f56
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/leoupdate | 6 | ||||
| -rwxr-xr-x | tools/opticharger | 2 | ||||
| -rwxr-xr-x | tools/squisher | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/leoupdate b/tools/leoupdate index 4ed5348b..8f43b8df 100755 --- a/tools/leoupdate +++ b/tools/leoupdate @@ -6,7 +6,7 @@ mkdir -p "$LOC"/temp cd "$LOC"/temp echo "extract update.zip" -unzip -o -qq "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip +unzip -o -qq "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip echo "Making Leo Compatible Update script" cd "$LOC" @@ -22,8 +22,8 @@ cd "$LOC"/temp rm -rf "$LOC"/temp/boot.img rm -rf "$LOC"/temp/boot cp -a "$LOC"/boot "$LOC"/temp/boot -rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip -zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip * > /dev/null +rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip +zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip * > /dev/null cd "$LOC" echo Cleanup... diff --git a/tools/opticharger b/tools/opticharger index 203fd2b6..f8a9d8af 100755 --- a/tools/opticharger +++ b/tools/opticharger @@ -25,7 +25,7 @@ TMPDIR=/tmp/opticharge-$$ if [ "$APKCERTS" = "" ]; then - APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$LOGNAME/META/apkcerts.txt + APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt if [ ! -f "$APKCERTS" ]; then echo "Set APKCERTS to the path to your apkcerts.txt file" diff --git a/tools/squisher b/tools/squisher index 61a3663b..c82443f4 100755 --- a/tools/squisher +++ b/tools/squisher @@ -24,9 +24,9 @@ if [ -z "$OUT" -o ! -d "$OUT" ]; then fi if [ "$TARGET_BUILD_TYPE" = "debug" ]; then - OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip + OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip else - OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip + OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip fi if [ ! -f "$OTAPACKAGE" ]; then echo "$OTAPACKAGE doesn't exist!"; |