mirrors/8821cu-20210916
1
0
Fork 0
mirror of https://github.com/morrownr/8821cu-20210916.git synced 2024-12-21 22:06:32 +00:00
Code Releases Activity

Added vi as a last-gasp fallback editor and tweaked a few previous changes

Browse Source
This commit is contained in:
Miles Goodhew 2023-01-24 21:59:56 +11:00
parent ece6b5f483
commit 33e6332496
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
default-editor → default-editor.txt
View File

27
edit-options.sh
View File

@ -26,7 +26,8 @@
SCRIPT_NAME="edit-options.sh" SCRIPT_NAME="edit-options.sh"
SCRIPT_VERSION="20230120" SCRIPT_VERSION="20230120"
OPTIONS_FILE="8821cu.conf" OPTIONS_FILE="8821cu.conf"
DEFAULT_EDITOR=`cat default-editor` DEFAULT_EDITOR="$(<default-editor.txt)"
EDITORS_SEARCH=("${VISUAL}" "${EDITOR}" "${DEFAULT_EDITOR}" "vi")
if [[ $EUID -ne 0 ]] if [[ $EUID -ne 0 ]]
then then
@ -35,19 +36,21 @@ then
exit 1 exit 1
fi fi
# Try to find the user's default text editor through ${VISUAL}, ${EDITOR} or nano # Try to find the user's default text editor through the EDITORS_SEARCH array
if command -v "${VISUAL}" >/dev/null 2>&1 for editor in ${EDITORS_SEARCH[@]}
do
if command -v "${editor}" >/dev/null 2>&1
then
TEXT_EDITOR="${editor}"
break
fi
done
# Fail if no editor was found
if ! command -v "${TEXT_EDITOR}" >/dev/null 2>&1
then then
TEXT_EDITOR="${VISUAL}"
elif command -v "${EDITOR}" >/dev/null 2>&1
then
TEXT_EDITOR="${EDITOR}"
elif command -v "${DEFAULT_EDITOR}" >/dev/null 2>&1
then
TEXT_EDITOR="${DEFAULT_EDITOR}"
else
echo "No text editor found (default: ${DEFAULT_EDITOR})." echo "No text editor found (default: ${DEFAULT_EDITOR})."
echo "Please install ${DEFAULT_EDITOR} or edit the file 'default-editor' to specify your editor." echo "Please install ${DEFAULT_EDITOR} or edit the file 'default-editor.txt' to specify your editor."
echo "Once complete, please run \"sudo ./${SCRIPT_NAME}\"" echo "Once complete, please run \"sudo ./${SCRIPT_NAME}\""
exit 1 exit 1
fi fi

27
install-driver.sh
View File

@ -38,7 +38,8 @@ OPTIONS_FILE="${MODULE_NAME}.conf"
SMEM=$(LANG=C free | awk '/Mem:/ { print $2 }') SMEM=$(LANG=C free | awk '/Mem:/ { print $2 }')
sproc=$(nproc) sproc=$(nproc)
DEFAULT_EDITOR=`cat default-editor` DEFAULT_EDITOR="$(<default-editor.txt)"
EDITORS_SEARCH=("${VISUAL}" "${EDITOR}" "${DEFAULT_EDITOR}" "vi")
# check to ensure sudo was used # check to ensure sudo was used
if [[ $EUID -ne 0 ]] if [[ $EUID -ne 0 ]]
@ -97,19 +98,21 @@ then
exit 1 exit 1
fi fi
# Try to find the user's default text editor through ${VISUAL}, ${EDITOR} or nano # Try to find the user's default text editor through the EDITORS_SEARCH array
if command -v "${VISUAL}" >/dev/null 2>&1 for editor in ${EDITORS_SEARCH[@]}
do
if command -v "${editor}" >/dev/null 2>&1
then
TEXT_EDITOR="${editor}"
break
fi
done
# Fail if no editor was found
if ! command -v "${TEXT_EDITOR}" >/dev/null 2>&1
then then
TEXT_EDITOR="${VISUAL}"
elif command -v "${EDITOR}" >/dev/null 2>&1
then
TEXT_EDITOR="${EDITOR}"
elif command -v "${DEFAULT_EDITOR}" >/dev/null 2>&1
then
TEXT_EDITOR="${DEFAULT_EDITOR}"
else
echo "No text editor found (default: ${DEFAULT_EDITOR})." echo "No text editor found (default: ${DEFAULT_EDITOR})."
echo "Please install ${DEFAULT_EDITOR} or edit the file 'default-editor' to specify your editor." echo "Please install ${DEFAULT_EDITOR} or edit the file 'default-editor.txt' to specify your editor."
echo "Once complete, please run \"sudo ./${SCRIPT_NAME}\"" echo "Once complete, please run \"sudo ./${SCRIPT_NAME}\""
exit 1 exit 1
fi fi