From: Douglas Mencken Date: Sun, 12 Aug 2012 21:13:36 +0000 (-0600) Subject: some tweaks for configRun: add -h/--usage option, use portable print instead of echo... X-Git-Tag: 2.2.0b~83^2~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b8bd0743bba5199eec8508e91b774b89808cbd6;p=oweals%2Fcde.git some tweaks for configRun: add -h/--usage option, use portable print instead of echo \c, etc. --- diff --git a/cde/admin/IntegTools/post_install/linux/configRun.src b/cde/admin/IntegTools/post_install/linux/configRun.src index 00c7e899..1736b8f2 100755 --- a/cde/admin/IntegTools/post_install/linux/configRun.src +++ b/cde/admin/IntegTools/post_install/linux/configRun.src @@ -214,6 +214,19 @@ XCOMM exists the link is correct /usr/dt/link EOF } + +PrintUsage() +{ + echo "Usage:" $0 "[OPERATION]" + echo "" + echo "Operations:" + echo " -e configure" + echo " -d deconfigure" + echo " -v verify" + echo " -s size" + echo " -h help" +} + #include "../option.func" XCOMM ########################################################################## @@ -239,6 +252,12 @@ DEFAULT_PRINTER="DtPrint" HandleOption $* + if [ "$OPERATION" = "usage" ] + then + PrintUsage + exit 0 + fi + if [ "$OPERATION" = "configure" ] then @@ -324,7 +343,7 @@ DEFAULT_PRINTER="DtPrint" then awk '{print "kill -1 " $2}' /tmp/tmppsout | /bin/csh else - /usr/sbin/inetd -s + [ -x /usr/sbin/inetd ] && /usr/sbin/inetd -s 2>/dev/null fi fi diff --git a/cde/admin/IntegTools/post_install/option.func b/cde/admin/IntegTools/post_install/option.func index 27b8cc72..d6ce94e4 100644 --- a/cde/admin/IntegTools/post_install/option.func +++ b/cde/admin/IntegTools/post_install/option.func @@ -3,7 +3,7 @@ HandleOption() while [ $# -ne 0 ]; do case $1 in -e) OPERATION="configure" - shift; + shift; ;; -d) OPERATION="deconfigure" shift; @@ -14,6 +14,12 @@ HandleOption() -s) OPERATION="size" shift; ;; + -h | --help | --usage) OPERATION="usage" + shift; + ;; + *) OPERATION="usage" + shift; + ;; esac done } diff --git a/cde/admin/IntegTools/post_install/verify.func b/cde/admin/IntegTools/post_install/verify.func index db7079c8..886d472e 100644 --- a/cde/admin/IntegTools/post_install/verify.func +++ b/cde/admin/IntegTools/post_install/verify.func @@ -5,9 +5,9 @@ then if [ -f ${tokens[0]} ] then - echo "exists \c" + printf "exists " else - echo "MISSING or REMOVED \c" + printf "MISSING or REMOVED " echo "${tokens[0]}" continue fi @@ -15,9 +15,9 @@ then if [ -L ${tokens[0]} ] then - echo "exists \c" + printf "exists " else - echo "MISSING or REMOVED \c" + printf "MISSING or REMOVED " echo "${tokens[0]}" continue fi @@ -32,36 +32,36 @@ if [ "$tmpperms" = "$realperms" ] then - echo "correct \c" + printf "correct " else - echo " WRONG \c" + printf " WRONG " fi owner=`ls -l ${tokens[0]} | awk '{print $3}'` if [ "$owner" = "${tokens[4]}" ] then - echo "correct \c" + printf "correct " else - echo " WRONG \c" + printf " WRONG " fi group=`ls -l ${tokens[0]} | awk '{print $4}'` if [ "$group" = "${tokens[5]}" ] then - echo "correct \c" + printf "correct " else - echo " WRONG \c" + printf " WRONG " fi elif [ "${tokens[3]}" = "sym_link" ] then linkto=`ls -l ${tokens[0]} | awk '{print $11}'` if [ "${tokens[2]}" = "$linkto" ] then - echo " the link is correct \c" + printf " the link is correct " else - echo " the link is WRONG \c" + printf " the link is WRONG " fi fi echo "${tokens[0]}"