jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEV_NAME for Raspberry not declared - fixed 

some little optimizations in dialog-windows
This commit is contained in:
schinfo 2019-04-16 00:52:01 +02:00
parent 690de44cae
commit ded0fbe280
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
manjaro-arm-installer
View File

@ -14,6 +14,7 @@ ROOTPASSWORD=""
SDCARD=""
SDTYP=""
SDDEV=""
DEV_NAME=""
TIMEZONE=""
LOCALE=""
@ -238,6 +239,7 @@ prepare_card () {
elif [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "oc2" ]] || [[ "$DEVICE" = "xu4" ]]; then
# umount SD card
umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1
umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1
#Clear first 8mb
dd if=/dev/zero of=${SDCARD} bs=1M count=8 1> /dev/null 2>&1
@ -257,6 +259,7 @@ prepare_card () {
elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then
# umount SD card
umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1
umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1
#Clear first 8mb
dd if=/dev/zero of=${SDCARD} bs=1M count=8 1> /dev/null 2>&1
@ -276,6 +279,7 @@ prepare_card () {
elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then
# umount SD card
umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1
umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1
#Clear first 8mb
dd if=/dev/zero of=${SDCARD} bs=1M count=32 1> /dev/null 2>&1
@ -347,27 +351,30 @@ fi
# Using Dialog to ask for user input for variables
DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose a device:" 20 51 6 \
"rpi3" "Raspberry Pi 3" \
"oc2" "Odroid C2" \
--menu "Choose a device:" 20 70 10 \
"pinebook" "Pinebook" \
"sopine" "Sopine/Pine64-LTS" \
"rock64" "Rock64" \
"rpi2" "Raspberry Pi 2 (unmaintained)" \
"rock64" "ROCK64" \
"rockpro64" "ROCKPro64" \
"sopine" "SOPINE / PINE A64-LTS" \
"oc2" "Odroid C2" \
"rpi3" "Raspberry Pi 3" \
"oc1" "Odroid C1/C1+ (unmaintained)" \
"xu4" "Odroid XU4 (unmaintained)" 3>&1 1>&2 2>&3 3>&-)
"xu4" "Odroid XU4 (unmaintained)" \
"rpi2" "Raspberry Pi 2 (unmaintained)" \
3>&1 1>&2 2>&3 3>&-)
#The if statement makes sure that the user has put in something in the previous prompt. If not (left blank or pressed cancel) the script will end
if [ ! -z "$DEVICE" ]
then
EDITION=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose an edition:" 20 50 5 \
"minimal" "Minimal Edition (Just CLI)" \
"lxqt" "Full LXQT Desktop and apps (lightweight)" \
--menu "Choose an edition:" 20 70 10 \
"minimal" "Minimal Edition (only CLI)" \
"kde" "Full KDE/Plasma Desktop (Heavy)" \
"lxqt" "Full LXQT Desktop and apps (lightweight)" \
"i3" "Mininal i3 WM with apps (very light)" \
"mate" "Full MATE desktop and apps (lightweight, unmaintained)" \
"i3" "Mininal i3 WM with apps (very light)" 3>&1 1>&2 2>&3 3>&-)
3>&1 1>&2 2>&3 3>&-)
else
clear
@ -426,10 +433,11 @@ while read -r line; do
W+=($line "")
done < <( lsblk -dn -o NAME )
SDCARD=$(dialog --title "Manjaro ARM Installer" \
--menu "Choose your SDCard - Be sure the correct drive is selected!" 20 50 5 \
--menu "Choose your SDCard - Be sure the correct drive is selected!" 20 50 10 \
"${W[@]}" 3>&2 2>&1 1>&3)
# add /dev/ to the selected option above
DEV_NAME=$SDCARD
SDCARD=/dev/$SDCARD
SDTYP=${SDCARD:5:2}
else