diff options
| -rwxr-xr-x | mirmon-wrapper.sh | 70 |
1 files changed, 55 insertions, 15 deletions
diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh index 74a12d6..04be5ce 100755 --- a/mirmon-wrapper.sh +++ b/mirmon-wrapper.sh @@ -2,24 +2,35 @@ NAME=$(basename "$0") -OPTIONS=( +OPTIONS_STR=( "mode" "xml-src" "url" ) +OPTIONS_BOOL=( + "help" + "debug" + "verbose" + "quiet" +) + + +helpmsg() { + echo "$*" 1>&2 +} usage() { - echo "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS[@]}" )" 1>&2 + helpmsg "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS_STR[@]}" )$(printf " --%s" "${OPTIONS_BOOL[@]}")" exit 3 } dohelp() { - echo "${NAME} TODO" 1>&2 + helpmsg "${NAME} TODO" exit 0 } die() { - echo "$*" 1>&2 + helpmsg "$*" exit 2 } @@ -34,7 +45,17 @@ main() { VAR_GMIRRORS=${VARDIR}/g.mirrors EXTRA_MIRRORS=${CONFDIR}/g.mirrors.extra # Lock outselves - [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "${VARDIR}/flock" "$0" "--xml-src=${XML_SRC}" "--mode=${MODE}" "--url=${URL}" || : + if [ "${FLOCKER}" != "$0" ]; then + exec \ + env FLOCKER="$0" flock -en "${VARDIR}/flock" \ + "$0" \ + ${DEBUG:+--debug} \ + ${QUIET:+--quiet} \ + ${VERBOSE:+--verbose} \ + "--xml-src=${XML_SRC}" \ + "--mode=${MODE}" \ + "--url=${URL}" + fi # Grab mirrors from the web mkdir -p "${VARDIR}" "${HTDOCS}" || die "Failed to mkdir" @@ -52,8 +73,16 @@ main() { test -w "${VARDIR}/mirmon.state" || die "Cannot write state file!" fi + MIRMON_OPTS=( + -c "${CONFFILE}" + -get update + ) + [[ $VERBOSE -eq 1 ]] && MIRMON_OPTS+=( '-v' ) + [[ $DEBUG -eq 1 ]] && MIRMON_OPTS+=( '-d' ) + [[ $QUIET -eq 1 ]] && MIRMON_OPTS+=( '-q' ) + # run mirmon - /usr/bin/perl "${MIRMON}" -c "${CONFFILE}" -q -get update || die "mirmon failed: $?" + /usr/bin/perl "${MIRMON}" "${MIRMON_OPTS[@]}" || die "mirmon failed: $?" # Set up a nice link to our mirror page directly: sed \ @@ -74,7 +103,8 @@ main() { } opts=$(getopt \ - --longoptions "$(printf "%s:," "${OPTIONS[@]}" )" \ + --longoptions "$(printf "%s:," "${OPTIONS_STR[@]}" )" \ + --longoptions "$(printf "%s," "${OPTIONS_BOOL[@]}" )" \ --name "$(basename "$0")" \ --options "" \ -- "$@" @@ -85,8 +115,10 @@ eval set --$opts MODE='' XML_SRC='' URL='' -HELP=0 -INVALID=0 +HELP= +DEBUG= +VERBOSE= +INVALID= while [[ $# -gt 0 ]]; do case "$1" in @@ -104,6 +136,14 @@ while [[ $# -gt 0 ]]; do URL=$2 shift 2 ;; + --debug) + DEBUG=1 + break + ;; + --verbose) + VERBOSE=1 + break + ;; --help) HELP=1 break @@ -143,12 +183,12 @@ for m in "${XML_SRC_INPUTS[@]}"; do done [[ $XML_SRC_VALID -eq 1 ]] || XML_SRC='' -[[ -z "$MODE" ]] && die "--mode must be one of: ${MODE_INPUTS[*]}" -[[ -z "$XML_SRC" ]] && die "--xml-src must be one of: ${XML_SRC_INPUTS[*]}" -[[ -z "$URL" ]] && die "--url unset" +[[ "$INVALID" == 1 ]] && usage +[[ "$HELP" == 1 ]] && dohelp -[[ $INVALID -eq 1 ]] && usage -[[ $HELP -eq 1 ]] && dohelp +if [[ -z "$MODE" ]]; then helpmsg "--mode must be one of: ${MODE_INPUTS[*]}" ; INVALID=1 ; fi +if [[ -z "$XML_SRC" ]]; then helpmsg "--xml-src must be one of: ${XML_SRC_INPUTS[*]}" ; INVALID=1 ; fi +if [[ -z "$URL" ]]; then helpmsg "--url unset" ; INVALID=1 ; fi +[[ "$INVALID" == 1 ]] && usage -OPTS=( ${opts} ) # for flock main |