diff --git a/stpkg b/stpkg index 39a3437c11e41b8023d7872a3b7173d6f1cc2a70..0bd4aeec2fcc5069e5efd3364fe077c0a5e0075e 100755 --- a/stpkg +++ b/stpkg @@ -96,7 +96,7 @@ __EXIT() { cd "$BASE_DIR"; } trap __exit EXIT alias exit=__exit -usage() { +__usage() { local BASE_NAME=$(basename $0) echo `__bold "$BASE_NAME usage:"` local BASE_NAME=`__green "$BASE_NAME"` @@ -904,7 +904,7 @@ __do_command() { else error "Conf file \"$STPKG_CONF_FILE\" doesn't exist. Did you use the install command?" error "Help:" - usage + __usage fi __do_mount @@ -913,7 +913,7 @@ __do_command() { STPKG_INSTALL=${STPKG_INSTALL:="~/html/stickerpicker/"} if [ ! -d "$STPKG_INSTALL" ]; then error "STPKG_INSTALL folder ($STPKG_INSTALL) doesn't exist. Did you use the install script?" - usage + __usage fi info "Using STPKG_INSTALL: $STPKG_INSTALL`[ "x$STPKG_SSHFS" = "xyes" ] && echo ' (this is an sshfs install)'`" @@ -1017,7 +1017,7 @@ __do_command() { ###################### # Parse command line # ###################### -[ "x$1" = "x" ] && usage +[ "x$1" = "x" ] && __usage case "$1" in show) __do_command show ;; update) __do_command update ;;