Merge pull request #164 from thw26/fix-winetricks

Fix controlPanel --winetricks; fix Installer -c

Author: thw26

CHANGELOG.md

@@ -2,6 +2,8 @@
 * 3.6.4
   - Make bash path environment agnostic [Vskillet]
   - Add bash completion file [T. H. Wright]
+  - Fix controlPanel's `--winetricks` function [T. H. Wright]
+  - Fix installer's `-c|--config` function [T. H. Wright]
 * 3.6.3-1
   - Introduce logos_info() and logos_warn() to simplify script feedback. [T. H. Wright]
 * 3.6.2

LogosLinuxInstaller.sh

@@ -1084,10 +1084,13 @@ OPTSTRING=':hvcDfFr' # Available options
 # First loop: set variable options which may affect other options
 while getopts "$OPTSTRING" opt; do
 	case $opt in
-			c)  NEXTOPT=$(${OPTIND})
-			if [ -n "$NEXTOPT" ] && [ "$NEXTOPT" != "-*" ]; then
+		c)
+			NEXTOPT="${!OPTIND}"
+			if [[ -n "$NEXTOPT" && "$NEXTOPT" != "-*" ]]; then
 				OPTIND=$((OPTIND + 1))
 				if [ -f "$NEXTOPT" ]; then
+					OPTIND=$(( OPTIND + 1 ))
+					echo "${NEXTOPT}"
 					LOGOS_CONFIG="${NEXTOPT}"
 					export LOGOS_CONFIG;
 					set -a

controlPanel-Template.sh

@@ -41,9 +41,8 @@ else
 	export WINESERVER_EXE="${WINESERVER_EXE}"; export WINESERVER_EXE;
 	export APPDIR_BINDIR="${APPDIR_BINDIR}"; export APPDIR_BINDIR
 	export APPIMAGE_LINK_SELECTION_NAME="${APPIMAGE_LINK_SELECTION_NAME}"; export APPIMAGE_LINK_SELECTION_NAME;
-	[ -z "\${WINETRICKS_URL}" ] && export WINETRICKS_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
-	[ -z "\${WINETRICKS_DOWNLOADER+x}" ] && export WINETRICKS_DOWNLOADER="wget"
 fi
+if [ -z "${WINETRICKS_URL}" ]; then WINETRICKS_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"; export WINETRICKS_URL; fi
 
 if [ -z "\${WINEDEBUG}" ]; then WINEDEBUG="fixme-all,err-all"; export WINEDEBUG; fi # Make wine output less verbose
 # END ENVIRONMENT
@@ -55,7 +54,7 @@ cat << EEOF
 Usage: ./\$TITLE
 Interact with ${FLPRODUCT} Bible Software in Wine on Linux.
 
-Options:x
+Options:
     -h   --help         Prints this help message and exit.
     -v   --version      Prints version information and exit.
     -D   --debug        Makes Wine print out additional info.
@@ -69,6 +68,55 @@ Options:x
 EEOF
 }
 
+cli_download() {
+	URI="\${1}"
+	DESTINATION="\${2}"
+	FILENAME="\${URI##*/}"
+
+	if [ "\${DESTINATION}" != "\${DESTINATION%/}" ]; then
+		TARGET="\${DESTINATION}/\${1##*/}"
+		[ -d "\${DESTINATION}" ] || mkdir -p "\${DESTINATION}" || echo "Cannot create \${DESTINATION}" && exit 1
+	elif [ -d "\${DESTINATION}" ]; then
+		TARGET="\${DESTINATION}/${1##*/}"
+	else
+		TARGET="\${DESTINATION}"
+		[ -d "\${DESTINATION%/*}" ] || mkdir -p "\${DESTINATION%/*}" || echo "Cannot create directory \${DESTINATION%/*}" && exit 1
+	fi
+	echo "\${URI}"
+	wget --inet4-only -c "\${URI}" -O "\${TARGET}"
+}
+setWinetricks() {
+	if [ -f "\${APPDIR_BINDIR}/winetricks" ]; then
+		WINETRICKSBIN="\${APPDIR_BINDIR}/winetricks"
+	elif [ \$(which winetricks) &> /dev/null ]; then
+		LOCAL_WINETRICKS_VERSION=\$(winetricks --version | awk -F' ' '{print \$1}')
+		if [ "\${LOCAL_WINETRICKS_VERSION}" -ge "20220411" ]; then
+			WINETRICKSBIN="\$(which winetricks)"
+		fi
+	else
+		if [ ! -z "\${WINETRICKS_URL}" ]; then
+			cli_download "\${WINETRICKS_URL}" "\${APPDIR_BINDIR}/winetricks"
+			chmod 755 "\${APPDIR_BINDIR}/winetricks"
+			WINETRICKSBIN="\${APPDIR_BINDIR}/winetricks"
+			if [ -z "${CONFIG_PATH}" ]; then
+				sed -ri 's/(WINETRICKSBIN=)(".*")/\1TAYLOR/' "\${CONFIG_PATH}"
+			fi
+		else
+			echo "WINETRICKS_URL not set."
+		fi
+	fi
+	export WINETRICKSBIN
+}
+runWinetricks() {
+	if [ ! -z "\${WINETRICKSBIN}" ] && [ -f "\${WINETRICKSBIN}" ]; then
+		:
+	else
+		setWinetricks
+	fi
+    "\${WINETRICKSBIN}" "$@"
+    "\${WINESERVER_EXE}" -w
+}
+
 selectAppImage() {
 		echo "======= Running AppImage Selection only: ======="
 		APPIMAGE_FILENAME=""
@@ -160,13 +208,7 @@ while getopts "\$OPTSTRING" opt; do
 					exit 0 ;;
 				winetricks)
 					shift
-					# Determine if user downloaded winetricks or used system winetricks
-					if [ -f "\${APPDIR_BINDIR}/winetricks" ]; then
-						WINETRICKSBIN="\${APPDIR_BINDIR}/winetricks"
-					else WINETRICKSBIN="\$(which winetricks)"
-					fi
-					"\${WINETRICKSBIN}" "\$@"
-					"\${WINESERVER_EXE}" -w
+					runWinetricks;
 					exit 0 ;;
 				#selectAppImage)
 					#selectAppImage ;;