diff --git a/check-piano.sh b/check-piano.sh index 78e7707..939d840 100755 --- a/check-piano.sh +++ b/check-piano.sh @@ -16,7 +16,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 1.1.1 +#- version ${SCRIPT_NAME} 1.1.2 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -37,6 +37,7 @@ SYNTAX=false DEBUG=false +Optnum=$# #============================ # FUNCTIONS @@ -112,12 +113,16 @@ ARRAY_OPTS=( [version]=v ) +LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))=" + # Parse options -while getopts ${SCRIPT_OPTS} OPTION ; do +while getopts ${SCRIPT_OPTS} OPTION +do # Translate long options to short - if [[ "x$OPTION" == "x-" ]]; then + if [[ "x$OPTION" == "x-" ]] + then 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 [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" diff --git a/edit-desktop.sh b/edit-desktop.sh index 0ccee71..c527bb8 100755 --- a/edit-desktop.sh +++ b/edit-desktop.sh @@ -16,7 +16,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 1.1.6 +#- version ${SCRIPT_NAME} 1.1.7 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -37,6 +37,7 @@ SYNTAX=false DEBUG=false +Optnum=$# #============================ # FUNCTIONS @@ -109,12 +110,16 @@ ARRAY_OPTS=( [version]=v ) +LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))=" + # Parse options -while getopts ${SCRIPT_OPTS} OPTION ; do +while getopts ${SCRIPT_OPTS} OPTION +do # Translate long options to short - if [[ "x$OPTION" == "x-" ]]; then + if [[ "x$OPTION" == "x-" ]] + then 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 [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" diff --git a/hampi-utilities.version b/hampi-utilities.version index 9dfcbaf..2baab63 100644 --- a/hampi-utilities.version +++ b/hampi-utilities.version @@ -1 +1 @@ -VERSION="2.1.11" \ No newline at end of file +VERSION="2.1.12" \ No newline at end of file diff --git a/name-radios.sh b/name-radios.sh index 525fc5c..c75e386 100755 --- a/name-radios.sh +++ b/name-radios.sh @@ -15,7 +15,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 1.3.3 +#- version ${SCRIPT_NAME} 1.3.4 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -36,6 +36,7 @@ SYNTAX=false DEBUG=false +Optnum=$# #============================ # FUNCTIONS @@ -105,12 +106,16 @@ ARRAY_OPTS=( [version]=v ) +LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))=" + # Parse options -while getopts ${SCRIPT_OPTS} OPTION ; do +while getopts ${SCRIPT_OPTS} OPTION +do # Translate long options to short - if [[ "x$OPTION" == "x-" ]]; then + if [[ "x$OPTION" == "x-" ]] + then 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 [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" diff --git a/patmail.sh b/patmail.sh index f1bc0a6..800ebae 100755 --- a/patmail.sh +++ b/patmail.sh @@ -63,7 +63,7 @@ #% #================================================================ #- IMPLEMENTATION -#- version ${SCRIPT_NAME} 2.2.5 +#- version ${SCRIPT_NAME} 2.2.6 #- author Steve Magnuson, AG7GN #- license CC-BY-SA Creative Commons License #- script_id 0 @@ -85,6 +85,7 @@ SYNTAX=false DEBUG=false +Optnum=$# #============================ # FUNCTIONS @@ -162,12 +163,16 @@ ARRAY_OPTS=( [log]=l ) +LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))=" + # Parse options -while getopts ${SCRIPT_OPTS} OPTION ; do +while getopts ${SCRIPT_OPTS} OPTION +do # Translate long options to short - if [[ "x$OPTION" == "x-" ]]; then + if [[ "x$OPTION" == "x-" ]] + then 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 [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND" diff --git a/tnc.sh b/tnc.sh index a2720c6..3b62cc3 100755 --- a/tnc.sh +++ b/tnc.sh @@ -383,7 +383,8 @@ VERSION="$(ScriptInfo version | grep version | tr -s ' ' | cut -d' ' -f 4)" #============================ # PARSE OPTIONS WITH GETOPTS #============================ - +Optnum=$# + #== set short options ==# SCRIPT_OPTS=':hc:v-:' @@ -398,6 +399,8 @@ ARRAY_OPTS=( [wait]=w ) +LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))=" + # Parse options while getopts ${SCRIPT_OPTS} OPTION do @@ -405,7 +408,7 @@ do if [[ "x$OPTION" == "x-" ]] then 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 [[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1) [[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"