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
format_fs()
{
local cmd
- echo -e '"Do not format" ""\next4 ""\nntfs ""\nfat32 ""' > $menufile
+ echo -e '"Do not re-format" ""\next4 ""\nntfs ""\nfat32 ""' > $menufile
set_answer_if_auto $FORCE_FORMAT
choose "Choose filesystem" "Please select a filesystem to format $1:"
case "$choice" in
losetup -d /dev/loop7
}
+gen_img()
+{
+ if [ "$fs" = "vfat" ]; then
+ ( dd bs=1M count=$1 if=/dev/zero | pv -ns $1m | dd of=$2 ) 2>&1 \
+ | progress_bar "Creating `basename $2`" "Expect to write $1 MB..."
+ else
+ dd if=/dev/zero bs=1 count=0 seek=$1M of=$2
+ fi
+}
+
create_img()
{
bname=`basename $2`
"\nPlease input the size of the $bname in MB:" 8 63 $1 2> $tempfile
size=`cat $tempfile`
[ 0$size -le 0 ] && size=2048
- ( dd bs=1M count=$size if=/dev/zero | pv -ns ${size}m | dd of=$2 ) 2>&1 \
- | progress_bar "Creating $bname" "Expect to write $size MB..."
+ gen_img $size $2
}
create_data_img()
try_upgrade()
{
[ -d $1 ] && return
- PREV_VERS="$PREV_VERS 7.1-r2 7.1-r1 7.1-rc2 7.1-rc1 6.0-r3 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
- local prev
- if [ -d hd/$v ]; then
- prev=hd/$v
- elif [ -d hd/android-$v ]; then
- prev=hd/android-$v
- else
- continue
- fi
+
+ for d in hd/*; do
+ [ -e "$d"/ramdisk.img -a -n "`ls "$d"/system* 2> /dev/null`" ] && echo \"`basename $d`\" \"\"
+ done | sort -r > $menufile
+
+ count=`wc -l < $menufile`
+ if [ $count -gt 1 ]; then
+ echo -e '"" ""\n"Install to new folder '`basename $1`'" ""' >> $menufile
+ choose "Multiple older versions are found" "Please select one to upgrade:"
+ elif [ $count -eq 1 ]; then
+ eval choice=`awk '{ print $1 }' $menufile`
set_answer_if_auto 1
adialog --title " Question " --yesno \
- "\nAn older version $v is detected.\nWould you like to upgrade it?" 8 51
- if [ $? -eq 0 ]; then
+ "\nAn older version $choice is detected.\nWould you like to upgrade it?" 8 61
+ [ $? -eq 0 ] || choice=
+ fi
+
+ if [ -n "$choice" ]; then
+ 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
- break
+ [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
fi
- done
+ fi
}
get_part_info()
done
if [ -z "$esp" ]; then
get_part_info $1
- boot=$(blkid /dev/$disk* | grep vfat | cut -d: -f1 | head -1)
+ boot=$(blkid /dev/$disk* | grep -v $disk: | grep vfat | cut -d: -f1 | head -1)
[ -z "$boot" ] && boot=`find_partition $disk 1` || boot=`basename $boot`
esp=`cat /sys/block/$disk/$boot/partition`
fi
echo -e "set kdir=/$asrc" >> $grubcfg
fi
echo -e '\nsource $cmdpath/android.cfg' >> $grubcfg
+ if [ -d src/boot/grub/theme ]; then
+ cp -R src/boot/grub/[ft]* efi/boot/grub
+ find efi/boot/grub -name TRANS.TBL -delete
+ fi
# Checking for old EFI entries, removing them and adding new depending on bitness
efibootmgr | grep -Eo ".{0,6}Android-x86" | cut -c1-4 > /tmp/efientries
fi
fi
- set_answer_if_auto 0
+ try_upgrade hd/$asrc
+
+ ! test -f hd/$asrc/system.img -o -d hd/$asrc/system
+ set_answer_if_auto $?
adialog --title " Question " --defaultno --yesno \
"\nDo you want to install /system directory as read-write?\n\nMaking /system be read-write is easier for debugging, but it needs more disk space and longer installation time." 10 61
- instal_rw=$?
-
- files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK"
- if [ $instal_rw -eq 0 ]; then
- if [ "$fs" = "vfat" -o "$fs" = "fuseblk" ]; then
- [ -e /sfs/system.img ] && sysimg="/sfs/system.img" || sysimg="mnt/$SRC/system.*"
- else
- sysimg="android/system"
- fi
+ if [ $? -eq 0 -a -e /sfs/system.img ]; then
+ sysimg="/sfs/system.img"
else
sysimg="mnt/$SRC/system.*"
fi
- files="$files $sysimg"
+ files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK $sysimg"
size=0
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*
OSDN Git Service
