1
0
mirror of https://github.com/AG7GN/nexus-utilities.git synced 2025-05-21 08:50:13 -07:00

Bug fixes

This commit is contained in:
Steve Magnuson 2020-03-14 14:29:50 -07:00
parent cb47c7b31d
commit 9c87186046
6 changed files with 42 additions and 19 deletions

View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.1.1 #- version ${SCRIPT_NAME} 1.1.2
#- 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
@ -37,6 +37,7 @@
SYNTAX=false SYNTAX=false
DEBUG=false DEBUG=false
Optnum=$#
#============================ #============================
# FUNCTIONS # FUNCTIONS
@ -112,12 +113,16 @@ ARRAY_OPTS=(
[version]=v [version]=v
) )
LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
# Parse options # Parse options
while getopts ${SCRIPT_OPTS} OPTION ; do 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 | 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"

View File

@ -16,7 +16,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.1.6 #- version ${SCRIPT_NAME} 1.1.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
@ -37,6 +37,7 @@
SYNTAX=false SYNTAX=false
DEBUG=false DEBUG=false
Optnum=$#
#============================ #============================
# FUNCTIONS # FUNCTIONS
@ -109,12 +110,16 @@ ARRAY_OPTS=(
[version]=v [version]=v
) )
LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
# Parse options # Parse options
while getopts ${SCRIPT_OPTS} OPTION ; do 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 | 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"

View File

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

View File

@ -15,7 +15,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 1.3.3 #- version ${SCRIPT_NAME} 1.3.4
#- 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
@ -36,6 +36,7 @@
SYNTAX=false SYNTAX=false
DEBUG=false DEBUG=false
Optnum=$#
#============================ #============================
# FUNCTIONS # FUNCTIONS
@ -105,12 +106,16 @@ ARRAY_OPTS=(
[version]=v [version]=v
) )
LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
# Parse options # Parse options
while getopts ${SCRIPT_OPTS} OPTION ; do 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 | 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"

View File

@ -63,7 +63,7 @@
#% #%
#================================================================ #================================================================
#- IMPLEMENTATION #- IMPLEMENTATION
#- version ${SCRIPT_NAME} 2.2.5 #- version ${SCRIPT_NAME} 2.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
@ -85,6 +85,7 @@
SYNTAX=false SYNTAX=false
DEBUG=false DEBUG=false
Optnum=$#
#============================ #============================
# FUNCTIONS # FUNCTIONS
@ -162,12 +163,16 @@ ARRAY_OPTS=(
[log]=l [log]=l
) )
LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
# Parse options # Parse options
while getopts ${SCRIPT_OPTS} OPTION ; do 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 | 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"

7
tnc.sh
View File

@ -383,7 +383,8 @@ VERSION="$(ScriptInfo version | grep version | tr -s ' ' | cut -d' ' -f 4)"
#============================ #============================
# PARSE OPTIONS WITH GETOPTS # PARSE OPTIONS WITH GETOPTS
#============================ #============================
Optnum=$#
#== set short options ==# #== set short options ==#
SCRIPT_OPTS=':hc:v-:' SCRIPT_OPTS=':hc:v-:'
@ -398,6 +399,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
@ -405,7 +408,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 | 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"