From bcc9051c196ebb54cff8bf1a906aac67bb5c6a25 Mon Sep 17 00:00:00 2001 From: Strit Date: Thu, 18 Apr 2019 09:08:33 +0200 Subject: [PATCH 1/5] update readme with correct package name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5597647..a5667c9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This script is "interactive". Meaning that it asks you questions when run to cus * parted * libarchive * binfmt-qemu-static -* mkpasswd +* expect (for mkpasswd) * gawk ## Installing: From 1a01d711261eb911a1a30f5b8a47fbef4fdf4add Mon Sep 17 00:00:00 2001 From: Helmut Stult Date: Thu, 18 Apr 2019 12:23:53 +0200 Subject: [PATCH 2/5] Changed back to mkpasswd, because the version in "expect" has an other function. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5667c9..5597647 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This script is "interactive". Meaning that it asks you questions when run to cus * parted * libarchive * binfmt-qemu-static -* expect (for mkpasswd) +* mkpasswd * gawk ## Installing: From 19a317dfeee06d56b1b870dd341d5e99c0cc6d63 Mon Sep 17 00:00:00 2001 From: Helmut Stult Date: Fri, 19 Apr 2019 22:49:23 +0200 Subject: [PATCH 3/5] Changed mkpasswd to same version as AUR also add version-info in script-file --- README.md | 2 +- manjaro-arm-installer | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5597647..abcfc78 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 969fe97..8a9a4ce 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -1,5 +1,9 @@ #! /bin/bash +# ***************************** +# Version 1.0.1 +# ***************************** + # 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!" From 37861aba85f72073b23c9c8c65bb864edc263c4b Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Wed, 1 May 2019 16:02:18 +0200 Subject: [PATCH 4/5] added cubocore edition --- manjaro-arm-installer | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 8a9a4ce..734d13a 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -374,9 +374,10 @@ 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)" \ + "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>&-) From 0c472d5addd1640e9afbba36d6950465908c4334 Mon Sep 17 00:00:00 2001 From: schinfo Date: Wed, 1 May 2019 22:33:23 +0200 Subject: [PATCH 5/5] little fix for dialog --- manjaro-arm-installer | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 734d13a..2efda87 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -1,7 +1,7 @@ #! /bin/bash # ***************************** -# Version 1.0.1 +# Version 1.0.2 # ***************************** # Set globals @@ -373,12 +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 (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)" \ + "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