1
0
mirror of https://github.com/AG7GN/nexus-utilities.git synced 2025-05-17 23:20:08 -07:00

Bug fixes

This commit is contained in:
Steve Magnuson 2020-03-14 14:20:09 -07:00
parent 849c958e2f
commit cb47c7b31d
7 changed files with 18 additions and 15 deletions

View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.1.0 #- version ${SCRIPT_NAME} 1.1.1
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -117,7 +117,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
# Translate long options to short # Translate long options to short
if [[ "x$OPTION" == "x-" ]]; then if [[ "x$OPTION" == "x-" ]]; then
LONG_OPTION=$OPTARG LONG_OPTION=$OPTARG
LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2) LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
LONG_OPTIND=-1 LONG_OPTIND=-1
[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"

View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.1.5 #- version ${SCRIPT_NAME} 1.1.6
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -114,7 +114,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
# Translate long options to short # Translate long options to short
if [[ "x$OPTION" == "x-" ]]; then if [[ "x$OPTION" == "x-" ]]; then
LONG_OPTION=$OPTARG LONG_OPTION=$OPTARG
LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2) LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
LONG_OPTIND=-1 LONG_OPTIND=-1
[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"

View File

@ -78,7 +78,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.2.5 #- version ${SCRIPT_NAME} 1.2.6
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -203,6 +203,8 @@ ARRAY_OPTS=(
[wait]=w [wait]=w
) )
LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
# Parse options # Parse options
while getopts ${SCRIPT_OPTS} OPTION while getopts ${SCRIPT_OPTS} OPTION
do do
@ -210,16 +212,16 @@ do
if [[ "x$OPTION" == "x-" ]] if [[ "x$OPTION" == "x-" ]]
then then
LONG_OPTION=$OPTARG LONG_OPTION=$OPTARG
LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-) LONG_OPTARG=$(echo $LONG_OPTION | egrep "$LONG_OPTS" | cut -d'=' -f2-)
LONG_OPTIND=-1 LONG_OPTIND=-1
[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ "x$LONG_OPTARG" == "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"
OPTION=${ARRAY_OPTS[$LONG_OPTION]} OPTION=${ARRAY_OPTS[$LONG_OPTION]}
[[ "x$OPTION" = "x" ]] && OPTION="?" OPTARG="-$LONG_OPTION" [[ "x$OPTION" == "x" ]] && OPTION="?" OPTARG="-$LONG_OPTION"
if [[ $( echo "${SCRIPT_OPTS}" | grep -c "${OPTION}:" ) -eq 1 ]] if [[ $( echo "${SCRIPT_OPTS}" | grep -c "${OPTION}:" ) -eq 1 ]]
then then
if [[ "x${LONG_OPTARG}" = "x" ]] || [[ "${LONG_OPTARG}" = -* ]] if [[ "x${LONG_OPTARG}" == "x" ]] || [[ "${LONG_OPTARG}" == -* ]]
then then
OPTION=":" OPTARG="-$LONG_OPTION" OPTION=":" OPTARG="-$LONG_OPTION"
else else
@ -233,6 +235,7 @@ do
fi fi
fi fi
fi fi
#echo "OPTION=\"$OPTION\" OPTARG=\"$OPTARG\" LONG_OPTION=\"$LONG_OPTION\" LONG_OPTARG=\"$LONG_OPTARG\""
# Options followed by another option instead of argument # Options followed by another option instead of argument
if [[ "x${OPTION}" != "x:" ]] && [[ "x${OPTION}" != "x?" ]] && [[ "${OPTARG}" = -* ]] if [[ "x${OPTION}" != "x:" ]] && [[ "x${OPTION}" != "x?" ]] && [[ "${OPTARG}" = -* ]]

View File

@ -1 +1 @@
VERSION="2.1.10" VERSION="2.1.11"

View File

@ -15,7 +15,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.3.2 #- version ${SCRIPT_NAME} 1.3.3
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -110,7 +110,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
# Translate long options to short # Translate long options to short
if [[ "x$OPTION" == "x-" ]]; then if [[ "x$OPTION" == "x-" ]]; then
LONG_OPTION=$OPTARG LONG_OPTION=$OPTARG
LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2) LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
LONG_OPTIND=-1 LONG_OPTIND=-1
[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"

View File

@ -63,7 +63,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 2.2.4 #- version ${SCRIPT_NAME} 2.2.5
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0

4
tnc.sh
View File

@ -97,7 +97,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 3.3.6 #- version ${SCRIPT_NAME} 3.3.7
#- author Steve Magnuson, AG7GN #- author Steve Magnuson, AG7GN
#- license CC-BY-SA Creative Commons License #- license CC-BY-SA Creative Commons License
#- script_id 0 #- script_id 0
@ -405,7 +405,7 @@ do
if [[ "x$OPTION" == "x-" ]] if [[ "x$OPTION" == "x-" ]]
then then
LONG_OPTION=$OPTARG LONG_OPTION=$OPTARG
LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2) LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
LONG_OPTIND=-1 LONG_OPTIND=-1
[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"