remove trap and logical chaining in favor of if source, add brave to …

…optional

bin/omakub-sub/install.sh

@@ -45,10 +45,12 @@ else
 	*) INSTALLER_FILE="$OMAKUB_PATH/install/desktop/optional/app-$INSTALLER.sh" ;;
 	esac
 
-	trap "handle_omakub_source_error $INSTALLER_FILE" ERR
-	source $INSTALLER_FILE && gum spin --spinner globe --title "Install completed!" -- sleep 3 \
-	&& handle_omakub_source_success "$INSTALLER_FILE"
-	trap - ERR
+	if source $INSTALLER_FILE; then
+		gum spin --spinner globe --title "Install completed!" -- sleep 3
+		handle_omakub_source_success "$INSTALLER_FILE"
+	else
+		handle_omakub_source_error "$INSTALLER_FILE"
+	fi
 fi
 
 clear

bin/omakub-sub/update.sh

@@ -28,10 +28,12 @@ else
 	*) INSTALLER_FILE="$OMAKUB_PATH/install/terminal/app-$INSTALLER.sh" ;;
 	esac
 
-	trap "handle_omakub_source_error $INSTALLER_FILE" ERR
-	source $INSTALLER_FILE && gum spin --spinner globe --title "Update completed!" -- sleep 3 \
-	&& handle_omakub_source_success "$INSTALLER_FILE"
-	trap - ERR
+	if source $INSTALLER_FILE; then
+		gum spin --spinner globe --title "Update completed!" -- sleep 3
+		handle_omakub_source_success "$INSTALLER_FILE"
+	else
+		handle_omakub_source_error "$INSTALLER_FILE"
+	fi
 fi
 
 clear

first_run_choices.sh

@@ -1,4 +1,4 @@
-OPTIONAL_APPS=("1password" "Spotify" "Zoom" "Dropbox")
+OPTIONAL_APPS=("1password" "Spotify" "Zoom" "Dropbox" "Brave")
 DEFAULT_OPTIONAL_APPS='1password,Spotify,Zoom'
 export OMAKUB_FIRST_RUN_OPTIONAL_APPS=$(gum choose "${OPTIONAL_APPS[@]}" --no-limit --selected $DEFAULT_OPTIONAL_APPS --height 7 --header "Select optional apps" | tr ' ' '-')
 

install/desktop.sh

@@ -9,9 +9,11 @@ fi
 
 # Run desktop installers
 for installer in ~/.local/share/omakub/install/desktop/*.sh; do 
-    trap "handle_omakub_source_error $installer" ERR
-    source "$installer" && handle_omakub_source_success "$installer"
-    trap - ERR
+    if source "$installer"; then
+        handle_omakub_source_success "$installer"
+    else 
+        handle_omakub_source_error "$installer"
+    fi
 done
 
 # Revert to normal idle and lock settings

install/desktop/optional/app-1password.sh

@@ -3,7 +3,7 @@ if [[ -z $UTILS_SOURCED ]]; then
 fi
 ARCH=$(get_arch)
 case "$ARCH" in
-    --aarch64)
+    aarch64)
         cd /tmp
         curl -sSO https://downloads.1password.com/linux/tar/stable/aarch64/1password-latest.tar.gz
         curl -sSO https://downloads.1password.com/linux/tar/stable/aarch64/1password-latest.tar.gz.sig
@@ -16,7 +16,7 @@ case "$ARCH" in
         sudo /opt/1Password/after-install.sh
         cd -
     ;;
-    --*)
+    *)
         # Install 1password and 1password-cli single script
         curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
         sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg

install/desktop/select-optional-apps.sh

@@ -8,10 +8,11 @@ if [[ -v OMAKUB_FIRST_RUN_OPTIONAL_APPS ]]; then
 
 	if [[ -n "$apps" ]]; then
 		for app in $apps; do
-			trap "handle_omakub_source_error $app" ERR
-			source "$OMAKUB_PATH/install/desktop/optional/app-${app,,}.sh" \
-			&& handle_omakub_source_success "$app"
-    		trap - ERR
+			if source "$OMAKUB_PATH/install/desktop/optional/app-${app,,}.sh"; then
+				handle_omakub_source_success "$app"
+			else 
+				handle_omakub_source_error "$app"
+			fi
 		done
 	fi
 fi

install/terminal.sh

@@ -10,7 +10,9 @@ fi
 
 # Run terminal installers
 for installer in ~/.local/share/omakub/install/terminal/*.sh; do
-    trap "handle_omakub_source_error $installer" ERR
-    source "$installer" && handle_omakub_source_success "$installer"
-    trap - ERR
+    if source "$installer"; then
+        handle_omakub_source_success "$installer"
+    else
+        handle_omakub_source_error "$installer"
+    fi
 done