1-install: support user-defined PREV_VERS

This allows a variant build to define its previous versions
to be upgraded.

diff --git a/Android.mk b/Android.mk
index 74aea9a..9c38ce9 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@ $(INITRD_RAMDISK): $(initrd_bin) $(systemimg) $(TARGET_INITRD_SCRIPTS) | $(ACP)
        mkdir -p $(addprefix $(TARGET_INSTALLER_OUT)/,android iso mnt proc sys tmp sfs hd)
        echo "VER=$(VER)" > $(TARGET_INSTALLER_OUT)/scripts/00-ver
        $(if $(INSTALL_PREFIX),echo "INSTALL_PREFIX=$(INSTALL_PREFIX)" >> $(TARGET_INSTALLER_OUT)/scripts/00-ver)
+       $(if $(PREV_VERS),echo "PREV_VERS=\"$(PREV_VERS)\"" >> $(TARGET_INSTALLER_OUT)/scripts/00-ver)
        $(MKBOOTFS) $(TARGET_INSTALLER_OUT) | gzip -9 > $@
 
 INSTALL_RAMDISK := $(PRODUCT_OUT)/install.img

diff --git a/install/scripts/1-install b/install/scripts/1-install
index daef853..0a8cc11 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -239,18 +239,23 @@ create_data_img()
 try_upgrade()
 {
        [ -d $1 ] && return
-       PREV_VERS="6.0-r2 6.0-r1 6.0-rc2 6.0-rc1 5.1-rc1 4.4-r5 4.4-r4 4.4-r3 4.4-r2 4.4-r1 4.4-RC2 4.4-RC1 4.4-test 4.3-test 4.2-test 4.0-r1 4.0-RC2 4.0-RC1"
+       PREV_VERS="$PREV_VERS 6.0-r2 6.0-r1 6.0-rc2 6.0-rc1 5.1-rc1 4.4-r5 4.4-r4 4.4-r3 4.4-r2 4.4-r1 4.4-RC2 4.4-RC1 4.4-test 4.3-test 4.2-test 4.0-r1 4.0-RC2 4.0-RC1"
        for v in $PREV_VERS; do
-               prev=hd/android-$v
-               if [ -d $prev ]; then
-                       dialog --title " Question " --yesno \
-                               "\nAn older Android-x86 version $v is detected.\nWould you like to upgrade it?" 8 55
-                       if [ $? -eq 0 ]; then
-                               mv $prev $1
-                               rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
-                               sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
-                               break
-                       fi
+               local prev
+               if [ -d hd/$v ]; then
+                       prev=hd/$v
+               elif [ -d hd/android-$v ]; then
+                       prev=hd/android-$v
+               else
+                       continue
+               fi
+               dialog --title " Question " --yesno \
+                       "\nAn older version $v is detected.\nWould you like to upgrade it?" 8 51
+               if [ $? -eq 0 ]; then
+                       mv $prev $1
+                       rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
+                       sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
+                       break
                fi
        done
 }