Add installer -k|--make-skel and -b|--custom-binary-path. Fix #166.

Author: thw26

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 * 3.7.1
-  - Add `-V|--verbose` to installer. Fix #165. [T. H. Wright]
+  - Add installer `-V|--verbose`. Fix #165. [T. H. Wright]
+  - Add installer `-k|--make_skel` and `-b|--custom-binary-path`. Resolve TODOs. Fix #166. [T. H. Wright]
   - Disable wine 8.0 installs. Fix #148. [T. H. Wright]
 * 3.7.0
   - Decoupled script from `zenity` and compatible with `dialog` and `whiptail`. Fix #104. [T. H. Wright]

LogosLinuxInstaller.sh

@@ -52,11 +52,14 @@ Options:
                                 \$HOME/.config/Logos_on_Linux/Logos_on_Linux.conf
                                 Optionally can accept a config file provided by
                                 the user.
+    -b   --custom-binary-path   Set a custom path to search for wine binaries
+                                during the install.
     -r   --regenerate-scripts   Regenerates the Logos.sh and controlPanel.sh
                                 scripts using the config file.
     -F   --skip-fonts           Skips installing corefonts and tahoma.
     -f   --force-root           Sets LOGOS_FORCE_ROOT to true, which permits
                                 the root user to run the script.
+    -k   --make-skel            Make a skeleton install only.
 EOF
 }
 
@@ -446,20 +449,6 @@ make_skel() {
 	verbose && echo "skel64 done!"
 }
 
-# TODO: Move this to a CLI optarg.
-
-#	#======= Parsing =============
-#	case "${1}" in
-#		"skel64")
-#			export WINE_EXE="wine64"
-#			make_skel "${WINE_EXE}" "none.AppImage"
-#			rm -rf "${WORKDIR}"
-#			exit 0
-#			;;
-#		*)
-#			verbose && echo "No arguments parsed."
-#	esac
-
 ## BEGIN CHECK DEPENDENCIES FUNCTIONS
 check_commands() {
     for cmd in "$@"; do
@@ -644,7 +633,7 @@ checkPath() {
 
 createWineBinaryList() {
 	#TODO: Make optarg to add custom path to this array.
-	WINEBIN_PATH_ARRAY=( "/usr/local/bin" "$HOME/bin" "$HOME/PlayOnLinux/wine/linux-amd64/*/bin" "$HOME/.steam/steam/steamapps/common/Proton - Experimental/files/bin" )
+	WINEBIN_PATH_ARRAY=( "/usr/local/bin" "$HOME/bin" "$HOME/PlayOnLinux/wine/linux-amd64/*/bin" "$HOME/.steam/steam/steamapps/common/Proton - Experimental/files/bin" "${CUSTOMBINPATH}" )
 
 	# Temporarily modify PATH for additional WINE64 binaries.
 	for p in "${WINEBIN_PATH_ARRAY[@]}"; do
@@ -796,6 +785,11 @@ checkExistingInstall() {
 }
 
 beginInstall() {
+	if [ "${SKEL}" -eq "1" ]; then
+		verbose && echo "Making a skeleton install of the project only. Exiting after completion."
+		make_skel "none.AppImage"
+		exit 0;
+	fi
 	if [ -n "${WINEBIN_CODE}" ]; then	
 		case "${WINEBIN_CODE}" in
 			"System"|"Proton"|"PlayOnLinux"|"Custom")
@@ -1216,8 +1210,6 @@ postInstall() {
 
 main() {
 	echo "$LOGOS_SCRIPT_TITLE, $LOGOS_SCRIPT_VERSION by $LOGOS_SCRIPT_AUTHOR."
-	die-if-root;
-	getDialog;
 	debug && logos_info "Debug mode enabled."
 
 	# BEGIN PREPARATION
@@ -1252,6 +1244,11 @@ main() {
 	fi
 }
 
+# BEGIN SCRIPT
+
+die-if-root;
+getDialog;
+
 # BEGIN OPTARGS
 RESET_OPTARGS=true
 for arg in "$@"
@@ -1269,10 +1266,12 @@ do
 		--regenerate-scripts)	set -- "$@" -r ;;
 		--force-root)			set -- "$@" -f ;;
 		--debug)				set -- "$@" -D ;;
+        --make-skel)			set -- "$@" -k ;;
+		--custom-binary-path)	set -- "$@" -b ;;
 		*)						set -- "$@" "$arg" ;;
 	esac
 done
-OPTSTRING=':hvVcDfFr' # Available options
+OPTSTRING=':hvVcDfFrkb:' # Available options
 
 # First loop: set variable options which may affect other options
 while getopts "$OPTSTRING" opt; do
@@ -1310,6 +1309,13 @@ while getopts "$OPTSTRING" opt; do
 		r)  export REGENERATE="1"; ;;
 		D)  export DEBUG="true";
 			WINEDEBUG=""; ;;
+		k)  export SKEL="1"; ;;
+		b)  CUSTOMBINPATH="$2";
+			if [ -d "$CUSTOMBINPATH" ]; then
+				export CUSTOMBINPATH;
+			else
+				logos_info "$LOGOS_SCRIPT_TITLE: User supplied path: \"${OPTARG}\". Custom binary path does not exist." >&2 && usage >&2 && exit 
+			fi; shift 2 ;;
 		\?) logos_info "$LOGOS_SCRIPT_TITLE: -$OPTARG: undefined option." >&2 && usage >&2 && exit ;;
 		:)  logos_info "$LOGOS_SCRIPT_TITLE: -$OPTARG: missing argument." >&2 && usage >&2 && exit ;;
 	esac

README.md

@@ -11,7 +11,7 @@ This repository contains a set of bash scripts for installing Logos Bible (Verbu
 
 ```
 Usage: ./LogosLinuxInstaller.sh
-Installs  Bible Software with Wine on Linux.
+Installs ${FLPRODUCT} Bible Software with Wine on Linux.
 
 Options:
     -h   --help                 Prints this help message and exit.
@@ -20,14 +20,17 @@ Options:
     -D   --debug                Makes Wine print out additional info.
     -c   --config               Use the Logos on Linux config file when
                                 setting environment variables. Defaults to:
-                                $HOME/.config/Logos_on_Linux/Logos_on_Linux.conf
+                                \$HOME/.config/Logos_on_Linux/Logos_on_Linux.conf
                                 Optionally can accept a config file provided by
                                 the user.
+    -b   --custom-binary-path   Set a custom path to search for wine binaries
+                                during the install.
     -r   --regenerate-scripts   Regenerates the Logos.sh and controlPanel.sh
                                 scripts using the config file.
     -F   --skip-fonts           Skips installing corefonts and tahoma.
     -f   --force-root           Sets LOGOS_FORCE_ROOT to true, which permits
                                 the root user to run the script.
+    -k   --make-skel            Make a skeleton install only.
 ```
 
 ## Logos.sh