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

Merge branch 'master' into testing

This commit is contained in:
Helmut Stult 2019-05-02 11:19:09 +02:00
parent 2f6f7c411a 0c472d5add
commit 7dfcd7da0e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -14,7 +14,7 @@ This script is "interactive". Meaning that it asks you questions when run to cus
* parted * parted
* libarchive * libarchive
* binfmt-qemu-static * binfmt-qemu-static
* mkpasswd * debian-whois-mkpasswd
* gawk * gawk
## Installing: ## Installing:

17
manjaro-arm-installer
View File

@ -1,5 +1,9 @@
#! /bin/bash #! /bin/bash
# *****************************
# Version 1.0.2
# *****************************
# Set globals # Set globals
TMPDIR=/var/tmp/manjaro-arm-installer TMPDIR=/var/tmp/manjaro-arm-installer
ARCH='aarch64' ARCH='aarch64'
@ -48,7 +52,7 @@ if [ ! -f /usr/bin/git ]; then
echo "bsdtar command is missing! Please install libarchive!" echo "bsdtar command is missing! Please install libarchive!"
exit 1 exit 1
elif [ ! -f /usr/bin/mkpasswd ]; then elif [ ! -f /usr/bin/mkpasswd ]; then
echo "mkpasswd command is missing! Please install mkpasswd!" echo "mkpasswd command is missing! Please install debian-whois-mkpasswd!"
exit 1 exit 1
elif [ ! -f /usr/bin/awk ]; then elif [ ! -f /usr/bin/awk ]; then
echo "awk command is missing! Please install gawk!" echo "awk command is missing! Please install gawk!"
@ -369,11 +373,12 @@ if [ ! -z "$DEVICE" ]
then then
EDITION=$(dialog --clear --title "Manjaro ARM Installer" \ EDITION=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose an edition:" 20 75 10 \ --menu "Choose an edition:" 20 75 10 \
"minimal" "Minimal Edition (only CLI)" \ "minimal" "Minimal Edition (only CLI)" \
"kde" "Full KDE/Plasma Desktop (Heavy)" \ "kde" "Full KDE/Plasma Desktop (full featured)" \
"lxqt" "Full LXQT Desktop and apps (lightweight)" \ "lxqt" "Full LXQT Desktop and apps (lightweight)" \
"i3" "Mininal i3 WM with apps (very light)" \ "i3" "Mininal i3 WM with apps (very light)" \
"mate" "Full MATE desktop and apps (lightweight, unmaintained)" \ "cubocore" "QT based Desktop (lightweight)" \
"mate" "Full MATE desktop and apps (lightweight, unmaintained)" \
3>&1 1>&2 2>&3 3>&-) 3>&1 1>&2 2>&3 3>&-)
else else