Merge pull request #198 from thw26/master

Fix Smaller Issues

Author: thw26

CHANGELOG.md

@@ -1,13 +1,19 @@
 # Changelog
+* 3.7.5
+  - Fix #131. [T. H. Wright]
+  - Fix #132. [T. H. Wright]
+  - Fix #157. [T. H. Wright]
+  - Fix #161. [T. H. Wright]
+  - Create logos_reuse_downloads().
 * 3.7.4
-  - Fix #194.
+  - Fix #194. [T. H. Wright]
 * 3.7.3
-  - Fix #186.
-  - Add GUI logging at `~/.local/state/Logos_on_Linux/install.log`.
+  - Fix #186. [T. H. Wright]
+  - Add GUI logging at `~/.local/state/Logos_on_Linux/install.log`. [T. H. Wright]
 * 3.7.2
-  - Fix #178.
-  - Make AppImage default install.
-  - Add options to `-D|--debug`.
+  - Fix #178. [T. H. Wright]
+  - Make AppImage default install. [T. H. Wright]
+  - Add options to `-D|--debug`. [T. H. Wright]
 * 3.7.1
   - 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]

Launcher-Template.sh

@@ -87,6 +87,8 @@ Options:
                                HOME/.local/share/applications.
     --remove-all-index         Removes all index and library catalog files.
     --remove-library-catalog   Removes all library catalog files.
+	--install-bash-completion  Installs the bash completion file to
+                               /etc/bash_completion.d/.
 UEOF
 }
 
@@ -329,6 +331,17 @@ SEOF
 	echo "======= making new ${FLPRODUCT}Bible.desktop shortcut done! ======="
 	exit 0
 }
+
+installBashCompletion() {
+	URL="https://raw.githubusercontent.com/ferion11/LogosLinuxInstaller/master/LogosLinuxInstaller.bash"
+	wget -O "${HOME}/Downloads/LogosLinuxInstaller.bash" "${URL}"
+	if [ -d "/etc/bash_completion.d" ]; then
+		sudo mv "${HOME}/Downloads/LogosLinuxInstaller.bash" /etc/bash_completion.d/
+	else
+		echo "ERROR: /etc/bash_completion.d is missing."
+		exit 1
+	fi
+}
 # END FUNCTION DECLARATIONS
 # BEGIN OPTARGS
 RESET_OPTARGS=true
@@ -379,6 +392,8 @@ while getopts "\$OPTSTRING" opt; do
 					removeAllIndex ;;
 				remove-library-catalog)
 					removeLibraryCatalog ;;
+				install-bash-completion)
+					installBashCompletion ;;
 				*)
 					if [ "\$OPTERR" = 1 ] && [ "\${OPTSTRING:0:1}" != ":" ]; then
 						echo "\$TITLE: --\${OPTARG}: undefined option." >&2 && usage >&2 && exit

LogosLinuxInstaller.bash

@@ -8,7 +8,7 @@ complete -F _logoslinuxinstaller_completions ./LogosLinuxInstaller.sh
 complete -F _logoslinuxinstaller_completions LogosLinuxInstaller
 
 _logos_completions() {
-	LOGOS_OPTIONS='-h --help -v --version -D --debbug -f --force-root -R --check-resources -e --edit-config -i --indexing -b --backup -r --restore -l --logs -d --dirlink -s --shortcut --remove-all-index --remove-library-catalog'
+	LOGOS_OPTIONS='-h --help -v --version -D --debbug -f --force-root -R --check-resources -e --edit-config -i --indexing -b --backup -r --restore -l --logs -d --dirlink -s --shortcut --remove-all-index --remove-library-catalog --install-bash-completion'
 	COMPREPLY=($(compgen -W "${LOGOS_OPTIONS}" -- "${COMP_WORDS[1]}"))
 }
 

LogosLinuxInstaller.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC2317
 export LOGOS_SCRIPT_TITLE="Logos Linux Installer" # From https://github.com/ferion11/LogosLinuxInstaller
 export LOGOS_SCRIPT_AUTHOR="Ferion11, John Goodman, T. H. Wright"
-export LOGOS_SCRIPT_VERSION="3.7.4" # Script version for this Installer Script
+export LOGOS_SCRIPT_VERSION="3.7.5" # Script version for this Installer Script
 
 #####
 # Originally written by Ferion11.
@@ -66,6 +66,18 @@ Options:
 EOF
 }
 
+die-if-running() {
+	PIDF=/tmp/LogosLinuxInstaller.pid
+
+	if [ -f "${PIDF}" ]; then
+		if logos_continue_question "The script is already running on PID $(cat "${PIDF}"). Should it be killed to allow this instance to run?" "The script is already running. Exiting." "1"; then
+			kill -9 "$(cat "${PIDF}")"
+		fi
+	fi
+	trap 'rm -f -- "${PIDF}"' EXIT
+	echo $$ > "${PIDF}"
+}
+
 die-if-root() {
 	if [ "$(id -u)" -eq '0' ] && [ -z "${LOGOS_FORCE_ROOT}" ]; then
 		logos_error "Running Wine/winetricks as root is highly discouraged. Use -f|--force-root if you must run as root. See https://wiki.winehq.org/FAQ#Should_I_run_Wine_as_root.3F"
@@ -213,6 +225,7 @@ logos_error() {
 	TELEGRAM_LINK="https://t.me/linux_logos"
 	MATRIX_LINK="https://matrix.to/#/#logosbible:matrix.org"
     ERROR_MESSAGE="${1}"
+	SECONDARY="${2}"
 	HELP_MESSAGE="If you need help, please consult:\n\n${WIKI_LINK}\n${TELEGRAM_LINK}\n${MATRIX_LINK}"
 	if [[ "${DIALOG}" == "whiptail" ]] || [[ "${DIALOG}" == "dialog" ]]; then
 	    cli_msg "${ERROR_MESSAGE}\n\n${HELP_MESSAGE}";
@@ -222,7 +235,10 @@ logos_error() {
 	elif [[ "${DIALOG}" == "kdialog" ]]; then
 		:
 	fi
-	kill -SIGKILL "-$(($(ps -o pgid= -p "${$}")))"
+	if [ -z "${SECONDARY}" ]; then
+		rm /tmp/LogosLinuxInstaller.pid
+		kill -SIGKILL "-$(($(ps -o pgid= -p "${$}")))"
+	fi
 	exit 1;
 }
 cli_question() {
@@ -240,12 +256,13 @@ cli_question() {
 cli_continue_question() {
 	QUESTION_TEXT="${1}"
 	NO_TEXT="${2}"
-	if ! cli_question "${1}"; then logos_error "${2}"; fi
+	SECONDARY="${3}"
+	if ! cli_question "${QUESTION_TEXT}"; then logos_error "${NO_TEXT}" "${SECONDARY}"; fi
 }
 cli_acknowledge_question() {
 	QUESTION_TEXT=${1}
 	NO_TEXT="${2}"
-	if ! cli_question "${1}"; then logos_info "${2}"; fi
+	if ! cli_question "${QUESTION_TEXT}"; then logos_info "${NO_TEXT}"; fi
 }
 gtk_question() {
 	if zenity --question --width=300 --height=200 --text "$@" --title='Question:'
@@ -256,20 +273,22 @@ gtk_question() {
 gtk_continue_question() {
 	QUESTION_TEXT="${1}"
 	NO_TEXT="${2}"
-	if ! gtk_question "$1"; then logos_error "The installation was cancelled!"; fi
+	SECONDARY="${3}"
+	if ! gtk_question "${QUESTION_TEXT}"; then logos_error "The installation was cancelled!" "${SECONDARY}"; fi
 }
 gtk_acknowledge_question() {
 	QUESTION_TEXT="${1}"
 	NO_TEXT=${2}
-	if ! gtk_question "$1"; then logos_info "${2}"; fi
+	if ! gtk_question "${QUESTION_TEXT}"; then logos_info "${NO_TEXT}"; fi
 }
 logos_continue_question() {
 	QUESTION_TEXT="${1}"
 	NO_TEXT=${2}
+	SECONDARY="${3}"
 	if [[ "${DIALOG}" == "whiptail" ]] || [[ "${DIALOG}" == "dialog" ]]; then
-		cli_continue_question "${QUESTION_TEXT}" "${NO_TEXT}"
+		cli_continue_question "${QUESTION_TEXT}" "${NO_TEXT}" "${SECONDARY}"
 	elif [[ "${DIALOG}" == "zenity" ]]; then
-		gtk_continue_question "${QUESTION_TEXT}" "${NO_TEXT}"
+		gtk_continue_question "${QUESTION_TEXT}" "${NO_TEXT}" "${SECONDARY}"
 	elif [[ "${DIALOG}" == "kdialog" ]]; then
 		:
 	fi
@@ -1267,6 +1286,7 @@ if [ -z "${DIALOG}" ]; then
 	fi
 fi
 
+die-if-running;
 die-if-root;
 
 # BEGIN OPTARGS