Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/bootable-newinstaller.git] / install / scripts / 1-install

diff --git a/install/scripts/1-install b/install/scripts/1-install
index 1d31ec0..44d899b 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -171,7 +171,7 @@ select_dev()
                for i in /sys/block/$d/$d*; do
                        [ -d $i ] || continue
                        echo $i | grep -qE "loop|ram|sr|boot|rpmb" && continue
-                       f=$(grep "`basename $i`" $tempfile || printf "%-11s%-29s" `basename $i` unknown)
+                       f=$(grep "`basename $i`" $tempfile || printf "%-11s%-30s" `basename $i` unknown)
                        sz=$(size_gb $i)
                        [ "$sz" = "0.00GB" ] || printf "$f%10s\n" $sz
                done
@@ -352,8 +352,11 @@ try_upgrade()
                prev=hd/$choice
                if [ -d "$prev" ]; then
                        mv $prev $1
+                       for d in `find hd -type l -maxdepth 1`; do
+                               [ "`readlink $d`" = "$choice" ] && ln -sf `basename $1` $d
+                       done
                        rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
-                       sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
+                       [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
                fi
        fi
 }
@@ -477,7 +480,7 @@ install_to()
                fi
                echo -e '\nsource $cmdpath/android.cfg' >> $grubcfg
                if [ -d src/boot/grub/theme ]; then
-                       cp -a src/boot/grub/[ft]* efi/boot/grub
+                       cp -R src/boot/grub/[ft]* efi/boot/grub
                        find efi/boot/grub -name TRANS.TBL -delete
                fi
 
@@ -497,6 +500,8 @@ install_to()
                fi
        fi
 
+       try_upgrade hd/$asrc
+
        ! test -f hd/$asrc/system.img -o -d hd/$asrc/system
        set_answer_if_auto $?
        adialog --title " Question " --defaultno --yesno \
@@ -511,7 +516,7 @@ install_to()
        for s in `du -sk $files | awk '{print $1}'`; do
                size=$(($size+$s))
        done
-       try_upgrade hd/$asrc
+
        mkdir -p hd/$asrc
        cd hd/$asrc
        rm -rf system*