Merge branch 'ferion11:master' into fix-169-b

Author: thw26

Launcher-Template.sh

@@ -385,7 +385,9 @@ OPTIND=1 # Reset the index.
 while getopts "\$OPTSTRING" opt; do
 	case \$opt in
 		h)  usage && exit ;;
-		v)  echo "\$TITLE, \$VERSION by \$AUTHOR." && exit ;;
+		v)  echo "\$TITLE, \$VERSION by \$AUTHOR. Logos Installer Version (may be updated since): \$LOGOS_EXECUTABLE";
+			"\${WINE_EXE}" "--version"
+			exit ;;
 		-)
 			case "\${OPTARG}" in
 				remove-all-index)

LogosLinuxInstaller.sh

@@ -12,7 +12,7 @@ export LOGOS_SCRIPT_VERSION="3.8.0" # Script version for this Installer Script
 
 # BEGIN ENVIRONMENT
 if [ -z "${WINE64_APPIMAGE_FULL_VERSION}" ]; then WINE64_APPIMAGE_FULL_VERSION="v7.18-staging"; export WINE64_APPIMAGE_FULL_VERSION; fi
-if [ -z "${WINE64_APPIMAGE_FULL_URL}" ]; then WINE64_APPIMAGE_FULL_URL="https://github.com/ferion11/LogosLinuxInstaller/releases/download/v10.0-1/wine-staging_7.18-x86_64.AppImage"; export WINE64_APPIMAGE_FULL_URL; fi
+if [ -z "${WINE64_APPIMAGE_FULL_URL}" ]; then WINE64_APPIMAGE_FULL_URL="https://github.com/ferion11/LogosLinuxInstaller/releases/download/wine-devel-8.19/wine-devel_8.19-x86_64.AppImage"; export WINE64_APPIMAGE_FULL_URL; fi
 if [ -z "${WINE64_APPIMAGE_FULL_FILENAME}" ]; then WINE64_APPIMAGE_FULL_FILENAME="$(basename "${WINE64_APPIMAGE_FULL_URL}")"; export WINE64_APPIMAGE_FULL_FILENAME; fi
 if [ -z "${WINE64_APPIMAGE_VERSION}" ]; then WINE64_APPIMAGE_VERSION="v7.18-staging"; export WINE64_APPIMAGE_VERSION; fi
 if [ -z "${WINE64_APPIMAGE_URL}" ]; then WINE64_APPIMAGE_URL="https://github.com/ferion11/LogosLinuxInstaller/releases/download/v10.0-1/wine-staging_7.18-x86_64.AppImage"; export WINE64_APPIMAGE_URL; fi
@@ -911,7 +911,7 @@ checkExistingInstall() {
 	if [ -d "${INSTALLDIR}" ]; then
 		if find "${INSTALLDIR}" -name Logos.exe -o -name Verbum.exe | grep -qE "(Logos\/Logos.exe|Verbum\/Verbum.exe)"; then
 			EXISTING_LOGOS_INSTALL=1; export EXISTING_LOGOS_INSTALL;
-			lgoos_error "An install was found at ${INSTALLDIR}. Please remove/rename it or use another location by setting the INSTALLDIR variable."
+			logos_error "An install was found at ${INSTALLDIR}. Please remove/rename it or use another location by setting the INSTALLDIR variable."
 		else
 			EXISTING_LOGOS_DIRECTORY=1; export EXISTING_LOGOS_DIRECTORY;
 			logos_error "A directory exists at ${INSTALLDIR}. Please remove/rename it or use another location by setting the INSTALLDIR variable."

README.md

@@ -127,7 +127,12 @@ sudo apt install mktemp patch lsof wget find sed grep gawk tr winbind cabextract
 If using wine from a repo, you must install wine staging. Run:
 
 ```
-sudo apt install winehq-staging
+sudo dpkg --add-architecture i386
+sudo mkdir -pm755 /etc/apt/keyrings
+sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+CODENAME=$(lsb_release -a | grep Codename | awk '{print $2}')
+sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/"${CODENAME}"/winehq-"${CODENAME}".sources
+sudo apt install --install-recommends winehq-staging
 ```
 
 See https://wiki.winehq.org/Ubuntu for help.

controlPanel-Template.sh

@@ -63,8 +63,8 @@ Options:
     --wine64            Run the script's wine64 binary.
     --wineserver        Run the script's wineserver binary.
     --winetricks        Run winetricks.
-    --setAppImage       Set the script's AppImage file. NOTE:
-                        Currently broken. Disabled until fixed.
+    --selectAppImage    Set the script's AppImage file.
+
 EEOF
 }
 
@@ -133,29 +133,29 @@ selectAppImage() {
 		APPIMAGE_DIR="\${APPIMAGE_DIR%?}"
 		#-------
 
-		if [ "\${APPIMAGE_DIR}" != "\${HERE}/data" ]; then
-			if zenity --question --width=300 --height=200 --text="Warning: The AppImage isn't at \"./data/ directory\"\!\nDo you want to copy the AppImage to the \"./data/\" directory keeping portability?" --  title='Warning!'; then
-					[ -f "\${HERE}/data/\${APPIMAGE_FILENAME}" ] && rm -rf "\${HERE}/data/\${APPIMAGE_FILENAME}"
-					cp "\${APPIMAGE_FULLPATH}" "\${HERE}/data/"
-					APPIMAGE_FULLPATH="\${HERE}/data/\${APPIMAGE_FILENAME}"
+		if [ "\${APPIMAGE_DIR}" != "\${HERE}/data/bin" ]; then
+			if zenity --question --width=300 --height=200 --text="Warning: The AppImage isn't at \"./data/bin/ directory\"\!\nDo you want to copy the AppImage to the \"./data/bin/\" directory keeping portability?" --  title='Warning!'; then
+					[ -f "\${HERE}/data/bin/\${APPIMAGE_FILENAME}" ] && rm -rf "\${HERE}/data/bin/\${APPIMAGE_FILENAME}"
+					cp "\${APPIMAGE_FULLPATH}" "\${HERE}/data/bin/"
+					APPIMAGE_FULLPATH="\${HERE}/data/bin/\${APPIMAGE_FILENAME}"
 			else
 				echo "Warning: Linking \${APPIMAGE_FULLPATH} to ./data/bin/\${APPIMAGE_LINK_SELECTION_NAME}"
 					chmod +x "\${APPIMAGE_FULLPATH}"
 					ln -s "\${APPIMAGE_FULLPATH}" "\${APPIMAGE_LINK_SELECTION_NAME}"
 					rm -rf "\${HERE}/data/bin/\${APPIMAGE_LINK_SELECTION_NAME}"
 					mv "\${APPIMAGE_LINK_SELECTION_NAME}" "\${HERE}/data/bin/"
-					(DISPLAY="" "\${HERE}/controlPanel.sh" "\${WINE_EXE}" wineboot) | zenity --progress --title="Wine Bottle update" --text="Updating Wine Bottle…" --pulsate --auto-close --no-cancel
+					#(DISPLAY="" "\${HERE}/controlPanel.sh" "\${WINE_EXE}" wineboot) | zenity --progress --title="Wine Bottle update" --text="Updating Wine Bottle…" --pulsate --auto-close --no-cancel
 					echo "======= AppImage Selection run done with external link! ======="
 					exit 0
 			fi
 		fi
 
 		echo "Info: Linking ../\${APPIMAGE_FILENAME} to ./data/bin/\${APPIMAGE_LINK_SELECTION_NAME}"
 		chmod +x "\${APPIMAGE_FULLPATH}"
-		ln -s "../\${APPIMAGE_FILENAME}" "\${APPIMAGE_LINK_SELECTION_NAME}"
+		ln -s "../\${HERE}/data/bin/\${APPIMAGE_FILENAME}" "\${APPIMAGE_LINK_SELECTION_NAME}"
 		rm -rf "\${HERE}/data/bin/\${APPIMAGE_LINK_SELECTION_NAME}"
 		mv "\${APPIMAGE_LINK_SELECTION_NAME}" "\${HERE}/data/bin/"
-		(DISPLAY="" "\${HERE}/controlPanel.sh" "\${WINE_EXE}" wineboot) | zenity --progress --title="Wine Bottle update" --text="Updating Wine Bottle…" --pulsate --auto-close --no-cancel
+		#(DISPLAY="" "\${HERE}/controlPanel.sh" "\${WINE_EXE}" wineboot) | zenity --progress --title="Wine Bottle update" --text="Updating Wine Bottle…" --pulsate --auto-close --no-cancel
 		echo "======= AppImage Selection run done! ======="
 		exit 0
 }
@@ -210,8 +210,9 @@ while getopts "\$OPTSTRING" opt; do
 					shift
 					runWinetricks;
 					exit 0 ;;
-				#selectAppImage)
-					#selectAppImage ;;
+				selectAppImage)
+					selectAppImage;
+     					exit 0;;
 				*)
 					if [ "\$OPTERR" = 1 ] && [ "\${OPTSTRING:0:1}" != ":" ]; then
 						echo "\$TITLE: --\${OPTARG}: undefined option." >&2 && usage >&2 && exit
@@ -248,4 +249,3 @@ debug && echo "Debug mode enabled."
 # restore IFS
 IFS=\${IFS_TMP}
 #-------------------------------------------------
-