ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Merge "tools: Fix for $LOGNAME missing in Ubuntu 11.10, using $USER instead" into gingerbread

Browse Source
This commit is contained in:
Steve Kondik 2011-09-26 04:46:29 +04:00 committed by Gerrit Code Review
commit 931d02ae3b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/leoupdate
View File

@ -6,7 +6,7 @@ mkdir -p "$LOC"/temp
cd "$LOC"/temp cd "$LOC"/temp
echo "extract update.zip" 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" echo "Making Leo Compatible Update script"
cd "$LOC" cd "$LOC"
@ -22,8 +22,8 @@ cd "$LOC"/temp
rm -rf "$LOC"/temp/boot.img rm -rf "$LOC"/temp/boot.img
rm -rf "$LOC"/temp/boot rm -rf "$LOC"/temp/boot
cp -a "$LOC"/boot "$LOC"/temp/boot cp -a "$LOC"/boot "$LOC"/temp/boot
rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip * > /dev/null zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip * > /dev/null
cd "$LOC" cd "$LOC"
echo Cleanup... echo Cleanup...

2
tools/opticharger
View File

@ -25,7 +25,7 @@ TMPDIR=/tmp/opticharge-$$
if [ "$APKCERTS" = "" ]; if [ "$APKCERTS" = "" ];
then 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" ]; if [ ! -f "$APKCERTS" ];
then then
echo "Set APKCERTS to the path to your apkcerts.txt file" echo "Set APKCERTS to the path to your apkcerts.txt file"

4
tools/squisher
View File

@ -24,9 +24,9 @@ if [ -z "$OUT" -o ! -d "$OUT" ]; then
fi fi
if [ "$TARGET_BUILD_TYPE" = "debug" ]; then 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 else
OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
fi fi
if [ ! -f "$OTAPACKAGE" ]; then if [ ! -f "$OTAPACKAGE" ]; then
echo "$OTAPACKAGE doesn't exist!"; echo "$OTAPACKAGE doesn't exist!";