Merge branch 'beliys' into 'master'

add stable-staging branch (fix...

Closes #265

See merge request applications/manjaro-architect!264

lib/util.sh

@@ -98,7 +98,7 @@ GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[
     if  [[ $(echo $GRAPHIC_CARD | grep -i "nvidia") != "" ]]; then
         MODULE="nouveau"
         # If NVIDIA, first need to know the integrated GC
-        [[ $(lscpu | grep -i "intel\|lenovo") != "" ]] && MCODE='initrd=\intel-ucode.img '    
+        [[ $(lscpu | grep -i "intel\|lenovo") != "" ]] && MCODE='initrd=\intel-ucode.img '
     # All non-NVIDIA cards / virtualisation
     elif [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then MCODE='initrd=\intel-ucode.img'
         MODULE="i915"
@@ -208,7 +208,7 @@ id_system() {
     check_for_error "system: $SYSTEM, init: $H_INIT nw-client: $NW_CMD"
 
     # evaluate host branch
-    ini system.branch "$(grep -oE -m 1 "unstable|stable|testing" /etc/pacman.d/mirrorlist)"
+    ini system.branch "$(grep -oE -m 1 "stable|stable-staging|testing|unstable" /etc/pacman.d/mirrorlist)"
 }
 
 # If there is an error, display it and go back to main menu. In any case, write to logfile.
@@ -417,7 +417,7 @@ check_connection() {
     fi
 
     # The error log is also cleared, just in case something is there from a previous use of the installer.
-    
+
 }
 
 # Greet the user when first starting the installer
@@ -461,9 +461,10 @@ configure_mirrorlist() {
 rank_mirrors() {
     #Choose the branch for mirrorlist
     local branch=""
-    local oldbranch="$(grep -oE -m 1 "unstable|stable|testing" /etc/pacman.d/mirrorlist)"
+    local oldbranch="$(grep -oE -m 1 "stable|stable-staging|testing|unstable" /etc/pacman.d/mirrorlist)"
     branch=$(DIALOG " $_MirrorBranch " --radiolist "\n$_UseSpaceBar\n " 0 0 3 \
             "stable" "-" on \
+            "stable-staging" "-" off \
             "testing" "-" off \
             "unstable" "-" off  3>&1 1>&2 2>&3)
     [[ -z "${branch}" ]] && return 0