Commit 5309e914 authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

d/thunderbird-wrapper*.sh: Prefixing some local variables

Doing some prefixing of local variables that using really generic names
otherwise which might conflicht in case they have been set outside of
the context from this script.
parent 6d487085
......@@ -255,18 +255,18 @@ case "${DESKTOP}" in
if [ $? -ne 0 ]; then
local_xmessage -center "${DOT_THUNDERBIRD_EXISTS}"
fi
FAIL=1
TB_FAIL=1
;;
kde)
local_kdialog --title "${TITLE}" --msgbox "${DOT_THUNDERBIRD_EXISTS}"
if [ $? -ne 0 ]; then
local_xmessage -center "${DOT_THUNDERBIRD_EXISTS}"
fi
FAIL=1
TB_FAIL=1
;;
*)
xmessage -center "${DOT_THUNDERBIRD_EXISTS}"
FAIL=1
TB_FAIL=1
;;
esac
}
......@@ -284,18 +284,18 @@ else
if [ $? -ne 0 ]; then
local_xmessage -center "${THUNDERBIRD_PROFILE_LINKING_ERROR}"
fi
FAIL=1
TB_FAIL=1
;;
kde)
local_kdialog --title "${TITLE}" --msgbox "${THUNDERBIRD_PROFILE_LINKING_ERROR}"
if [ $? -ne 0 ]; then
local_xmessage -center "${THUNDERBIRD_PROFILE_LINKING_ERROR}"
fi
FAIL=1
TB_FAIL=1
;;
*)
xmessage -center "${THUNDERBIRD_PROFILE_LINKING_ERROR}"
FAIL=1
TB_FAIL=1
;;
esac
output_debug "Ohh, that wasn't working, sorry! Do you have access rights to create a symlink?"
......@@ -340,7 +340,7 @@ echo "INFO -> $1"
# Simple debugging output function
output_debug () {
if [ "${VERBOSE}" = "1" ]; then
if [ "${TB_VERBOSE}" = "1" ]; then
echo "DEBUG -> $1"
fi
}
......
......@@ -38,10 +38,10 @@ ID_PROFILE_FOLDER=${HOME}/.icedove
TB_PROFILE_FOLDER=${HOME}/.thunderbird
TB_GDB_DEFAULT_OPTS=${TB_GDB_DEFAULT_OPTS:-"-ex \"handle SIG38 nostop\" -ex \"handle SIGPIPE nostop\""}
export HELP=0
export FAIL=0
export TB_HELP=0
export TB_FAIL=0
export FORCE_MIMEAPPS_MIGRATE=0
export VERBOSE=0
export TB_VERBOSE=0
unset DEBUG
unset DEBUGGER
......@@ -69,14 +69,14 @@ for ARG in "$@"; do
# shift
# ;;
--help)
HELP=1
TB_HELP=1
;;
--show-backup)
SHOW_BACKUP=1
;;
--verbose)
output_info "[[ ... using verbose mode ... ]]"
VERBOSE=1
TB_VERBOSE=1
;;
'?')
usage >&2
......@@ -99,7 +99,7 @@ fi
# If '--help' was called show usage() and exit immediately without other
# helpers can be called.
if [ "${HELP}" = "1" ]; then
if [ "${TB_HELP}" = "1" ]; then
usage
exit 0
fi
......@@ -231,7 +231,7 @@ elif { [ -d "${ID_PROFILE_FOLDER}" ] || [ -L "${ID_PROFILE_FOLDER}" ]; } && \
fi
if [ "${FAIL}" = 1 ]; then
if [ "${TB_FAIL}" = 1 ]; then
output_info "An error happened while trying to migrate the old Icedove profile folder '${ID_PROFILE_FOLDER}'."
output_info "Please take a look into the syslog file!"
exit 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment