Commit 7dfcd7da authored by Helmut Stult's avatar Helmut Stult

Merge branch 'master' into testing

parents 2f6f7c41 0c472d5a
......@@ -14,7 +14,7 @@ This script is "interactive". Meaning that it asks you questions when run to cus
* parted
* libarchive
* binfmt-qemu-static
* mkpasswd
* debian-whois-mkpasswd
* gawk
## Installing:
......
#! /bin/bash
# *****************************
# Version 1.0.2
# *****************************
# Set globals
TMPDIR=/var/tmp/manjaro-arm-installer
ARCH='aarch64'
......@@ -48,7 +52,7 @@ if [ ! -f /usr/bin/git ]; then
echo "bsdtar command is missing! Please install libarchive!"
exit 1
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
elif [ ! -f /usr/bin/awk ]; then
echo "awk command is missing! Please install gawk!"
......@@ -369,11 +373,12 @@ if [ ! -z "$DEVICE" ]
then
EDITION=$(dialog --clear --title "Manjaro ARM Installer" \
--menu "Choose an edition:" 20 75 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)" \
"minimal" "Minimal Edition (only CLI)" \
"kde" "Full KDE/Plasma Desktop (full featured)" \
"lxqt" "Full LXQT Desktop and apps (lightweight)" \
"i3" "Mininal i3 WM with apps (very light)" \
"cubocore" "QT based Desktop (lightweight)" \
"mate" "Full MATE desktop and apps (lightweight, unmaintained)" \
3>&1 1>&2 2>&3 3>&-)
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment