fix cancel action

lib/util-advanced.sh

@@ -11,26 +11,27 @@
 # or modify it as you wish.
 
 install_manjaro_de_wm_git() {
-    check_desktop
-    PROFILES="$DATADIR/profiles"
-    # Only show this information box once
-    if [[ $SHOW_ONCE -eq 0 ]]; then
-        DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n " 0 0
-        SHOW_ONCE=1
-    fi
-    clear
-    # install git if not already installed
-    inst_needed git
-    # download manjaro-tools.-isoprofiles git repo
-    if [[ -e $PROFILES ]]; then
-        git -C $PROFILES pull 2>$ERR
-        check_for_error "pull profiles repo" $?
-    else
-        git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES 2>$ERR
-        check_for_error "clone profiles repo" $?
-    fi
+    if check_desktop; then
+        PROFILES="$DATADIR/profiles"
+        # Only show this information box once
+        if [[ $SHOW_ONCE -eq 0 ]]; then
+            DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n " 0 0
+            SHOW_ONCE=1
+        fi
+        clear
+        # install git if not already installed
+        inst_needed git
+        # download manjaro-tools.-isoprofiles git repo
+        if [[ -e $PROFILES ]]; then
+            git -C $PROFILES pull 2>$ERR
+            check_for_error "pull profiles repo" $?
+        else
+            git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES 2>$ERR
+            check_for_error "clone profiles repo" $?
+        fi
 
-    install_manjaro_de_wm
+        install_manjaro_de_wm
+    fi
 }
 
 install_vanilla_de_wm() {

lib/util-desktop.sh

@@ -126,18 +126,19 @@ set_xkbmap() {
 }
 
 install_manjaro_de_wm_pkg() {
-    check_desktop
-    PROFILES="/usr/share/manjaro-tools/iso-profiles"
-    # Only show this information box once
-    if [[ $SHOW_ONCE -eq 0 ]]; then
-        DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n " 0 0
-        SHOW_ONCE=1
-    fi
-    clear
-    pacman -Sy --noconfirm $p manjaro-iso-profiles-{base,official,community} 2>$ERR
-    check_for_error "update profiles pkgs" $?
+    if check_desktop; then
+        PROFILES="/usr/share/manjaro-tools/iso-profiles"
+        # Only show this information box once
+        if [[ $SHOW_ONCE -eq 0 ]]; then
+            DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n " 0 0
+            SHOW_ONCE=1
+        fi
+        clear
+        pacman -Sy --noconfirm $p manjaro-iso-profiles-{base,official,community} 2>$ERR
+        check_for_error "update profiles pkgs" $?
 
-    install_manjaro_de_wm
+        install_manjaro_de_wm
+    fi
 }
 
 install_manjaro_de_wm() {

lib/util.sh

@@ -468,7 +468,7 @@ check_base() {
 
 check_desktop() {
     if [[ -e /mnt/.desktop_installed ]]; then
-        DIALOG " $_InstDETitle " --yesno "\n$_DesktopInstalled\n " 0 0 || return 0
+        DIALOG " $_InstDETitle " --yesno "\n$_DesktopInstalled\n " 0 0 || return 1
     fi
 }