# HG changeset patch # User edhoprima@gmail.com # Date 1261941482 0 # Node ID b03fef57b465a7a7a50fd68569db52c84cf5fbf0 # Parent 5d3a0645b5049f79590b9f8a4690601ac484bf9a - Fixed getopts, now that I remember where I take the code from diff -r 5d3a0645b504 -r b03fef57b465 moefetch.sh --- a/moefetch.sh Tue Dec 15 04:39:46 2009 +0000 +++ b/moefetch.sh Sun Dec 27 19:18:02 2009 +0000 @@ -138,7 +138,7 @@ EOF __tempnum=$(echo $(wc -l < "${TEMP_PREFIX}-templist")) - __iternum=$((__iternum + 1)) + __iternum=$((${__iternum} + 1)) cat "${TEMP_PREFIX}-templist" >> "${TEMP_PREFIX}-list" echo "${__tempnum} file(s) available" done @@ -170,10 +170,10 @@ numfiles=0 for dircontent in "${*}/"* "${*}/".*; do if [ "${dircontent}" != "${*}/*" ] || [ -e "${dircontent}" ]; then - numfiles=$((numfiles + 1)) + numfiles=$((${numfiles} + 1)) fi done - echo $((numfiles - 2)) + echo $((${numfiles} - 2)) } # check tools availability @@ -341,10 +341,10 @@ ;; esac shift - SITE= - TAGS= __has_pass=0 __has_user=0 + #copypasta from http://mywiki.wooledge.org/BashFAQ/035 + __optnum=1 while getopts "s:(site)n(noclean)u:(user)p:(password)" opt do case "$opt" in @@ -359,7 +359,9 @@ __has_user=1 ;; esac + __optnum="${OPTIND}" done + shift $((${__optnum}-1)) TAGS="$@" [ -n "${SITE}" ] || SITE=${DEFAULT_SITE} [ -n "${TAGS}" ] || Err_Fatal "No tag specified" @@ -380,8 +382,11 @@ # global variables goes here init_globals() { + cd . # Reset ${PWD} _version="0.3-beta3" # version of this script _use_login=0 # variable to check whether a login is used or not + SITE= + TAGS= } main()