Merge pull request #95 from grm34:dev

Update app regex

src/arch/mirrorlist

@@ -18,7 +18,7 @@ $(curl -s ipinfo.io/ | grep "country" | \
 sed 's/  "country": "//' | sed 's/",//')
 
     # Update mirrorlist if country code properly detected
-    if [[ ${COUNTRY} =~ ^[A-Z]{2}+$ ]]; then
+    if [[ ${COUNTRY} =~ ^[A-Z]{2}$ ]]; then
         _note "${COUNTRY} mirrors priority detected!"
         mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
 

src/arch/partition

@@ -98,7 +98,7 @@ _default_partitioning_scheme() {
 
             # Check if valid size and otherwise ask again
             until [[ ${PARTITION_SIZE} \
-=~ ^[1-9]{1}[[0-9]{0,2}(M|G|T|P){1}+$ ]]; do
+=~ ^[1-9]{1}[[0-9]{0,2}(M|G|T|P){1}$ ]]; do
                 _note "partition size {M,G,T,P} (e.g., ${SIZES[${INDEX}]})"
                 _prompt "Enter valid ${PART_NAME} partition size:"
                 read -r PARTITION_SIZE

src/arch/user

@@ -101,7 +101,7 @@ _get_user_variables() {
 
         # Custom kernel
         y|Y|yes|Yes|YES)
-            until [[ ${KERNEL} =~ ^([1-9]|4)$ ]]; do
+            until [[ ${KERNEL} =~ ^[1-4]$ ]]; do
                 _select "DEFAULT" "HARDENED" "LTS" "ZEN"
                 read -r KERNEL
             done
@@ -122,7 +122,7 @@ _get_user_variables() {
     _confirm "Do you wish to install a Desktop Environment?"
     case ${CONFIRM} in
         y|Y|yes|Yes|YES)
-            until [[ ${DESKTOP} =~ ^([1-9]|10)$ ]]; do
+            until [[ ${DESKTOP} =~ ^[1-9][0]?$ ]]; do
                 _select \
 "GNOME" "KDE" "MATE" "XFCE" "LXDE" "LXQT" \
 "DEEPIN" "BUDGIE" "CINNAMON" "ENLIGHTENMENT"
@@ -144,7 +144,7 @@ _get_user_variables() {
 
             # Custom display manager
             n|N|no|No|NO)
-                until [[ ${DISPLAY_MAN} =~ ^([1-5])$ ]]; do
+                until [[ ${DISPLAY_MAN} =~ ^[1-5]$ ]]; do
                     _select "GDM" "LIGHTDM" "SDDM" "LXDM" "XDM"
                     read -r DISPLAY_MAN
                 done