[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-registry/ register.sh
From:       "Thomas Lotterer" <thl () openpkg ! org>
Date:       2005-11-29 16:19:29
Message-ID: 20051129161929.0AD811B50DB () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  thl@openpkg.org
  Module: openpkg-registry                 Date:   29-Nov-2005 17:19:27
  Branch: HEAD                             Handle: 2005112916192700

  Modified files:
    openpkg-registry        register.sh

  Log:
    remove optional positional args in favor of option enforcement, it was
    reported they confuse the user; this makes --user and --mode
    mandatory; --args belongs to --mode

  Summary:
    Revision    Changes     Path
    1.12        +2  -16     openpkg-registry/register.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 register.sh
  --- openpkg-registry/register.sh	29 Nov 2005 16:15:36 -0000	1.11
  +++ openpkg-registry/register.sh	29 Nov 2005 16:19:27 -0000	1.12
  @@ -102,10 +102,6 @@
   verbose="no"
   help="no"
   
  -# Optional positional <user> and <desc> arguments
  -user=""
  -desc=""
  -
   #   iterate over argument line
   while [ $# -gt 0 ]; do
       opt=$1
  @@ -187,19 +183,9 @@
           -h|--help    ) help="Usage"  ;;
           -*           ) help="Invalid option \`$opt'"; break ;;
   
  -        # Optional positional <user> and <desc> arguments
  -        *            )
  -          if [ ".$user" = . ]; then
  -            user="$1"
  -          elif [ ".$desc" = . ]; then
  -            desc="$1"
  -          fi
  -          ;;
       esac
       shift
   done
  -[ ".$user" != . ] && REGISTRY_USER="$user"
  -[ ".$desc" != . ] && REGISTRY_DESC="$desc"
   
   #   display error or usage message
   if [ ".$help" != .no ]; then
  @@ -210,10 +196,10 @@
             [-v|--verbose] [-h|--help]
             [-P|--preparation] [-T|--transaction] [-U|--utilization] \
[-C|--convenience] [-I|--interaction]  [-c|--conf=<file>]
  -          [-m|--mode=<mode>] [-u|--user=<user>] [-d|--desc=<text>] \
[-a|--args=<args>]  +          -m|--mode=<mode> [-a|--args=<args>] -u|--user=<user> \
                [-d|--desc=<text>]
             [--uuid=<file>] [--prep=<file>] [--tran=<file>] [--util=<file>]
             [--plat=<text>] [--orel=<text>]
  -          [<user> [<desc>]]" 1>&2
  +          " 1>&2
   
       if [ ".$help" != ".Usage" ]; then
           exit 1
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]