mirror of
https://github.com/morrownr/8821cu-20210916.git
synced 2024-09-07 15:46:46 +00:00
Changed to search through VISUAL -> EDITOR -> nano -> -FAIL- for a text editor
This commit is contained in:
parent
e5c1d42247
commit
016389da56
@ -2,6 +2,7 @@
|
||||
#
|
||||
OPTIONS_FILE="8821cu.conf"
|
||||
SCRIPT_NAME="edit-options.sh"
|
||||
DEFAULT_EDITOR="nano"
|
||||
#
|
||||
# Purpose: Make it easier to edit the driver options file.
|
||||
#
|
||||
@ -20,20 +21,24 @@ then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if ${EDITOR} is an executable or try to default to nano or finally complain if it's not installed.
|
||||
if ! [ -x "${EDITOR}" ]
|
||||
# Try to find the user's default text editor through ${VISUAL}, ${EDITOR} or nano
|
||||
if command -v "${VISUAL}" >/dev/null 2>&1
|
||||
then
|
||||
EDITOR="$(which nano 2>/dev/null)"
|
||||
if ! [ -x "${EDITOR}" ]
|
||||
then
|
||||
echo "No text editor found (default: nano)."
|
||||
echo "Please install one and set the EDITOR variable to point to it."
|
||||
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 "Please install one and set the VISUAL or EDITOR variables to point to it."
|
||||
echo "When you have an editor, please run \"sudo ./${SCRIPT_NAME}\""
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
${EDITOR} /etc/modprobe.d/${OPTIONS_FILE}
|
||||
${TEXT_EDITOR} /etc/modprobe.d/${OPTIONS_FILE}
|
||||
|
||||
read -p "Do you want to apply the new options by rebooting now? [y/N] " -n 1 -r
|
||||
echo # move to a new line
|
||||
|
@ -19,6 +19,7 @@ SCRIPT_NAME="install-driver.sh"
|
||||
SCRIPT_VERSION="20230111"
|
||||
MODULE_NAME="8821cu"
|
||||
DRV_VERSION="5.12.0.4"
|
||||
DEFAULT_EDITOR="nano"
|
||||
|
||||
KVER="$(uname -r)"
|
||||
KARCH="$(uname -m)"
|
||||
@ -87,17 +88,21 @@ then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if ${EDITOR} is an executable or try to default to nano or finally complain if it's not installed.
|
||||
if ! [ -x "${EDITOR}" ]
|
||||
# Try to find the user's default text editor through ${VISUAL}, ${EDITOR} or nano
|
||||
if command -v "${VISUAL}" >/dev/null 2>&1
|
||||
then
|
||||
EDITOR="$(which nano 2>/dev/null)"
|
||||
if ! [ -x "${EDITOR}" ]
|
||||
then
|
||||
echo "No text editor found (default: nano)."
|
||||
echo "Please install one and set the EDITOR variable to point to it."
|
||||
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 "Please install one and set the VISUAL or EDITOR variables to point to it."
|
||||
echo "When you have an editor, please run \"sudo ./${SCRIPT_NAME}\""
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# support for the NoPrompt option allows non-interactive use of this script
|
||||
@ -357,7 +362,7 @@ then
|
||||
echo
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]
|
||||
then
|
||||
${EDITOR} /etc/modprobe.d/${OPTIONS_FILE}
|
||||
${TEXT_EDITOR} /etc/modprobe.d/${OPTIONS_FILE}
|
||||
fi
|
||||
|
||||
read -p "Do you want to reboot now? (recommended) [y/N] " -n 1 -r
|
||||
|
Loading…
Reference in New Issue
Block a user