Release 1.0.3

git-svn-id: http://shflags.googlecode.com/svn/tags/1.0.3@133 9d7cb843-df4f-0410-8a79-4785ae5a3405
nvie · May 10, 2009 · 2fb06af · 2fb06af
1 parent 01694f0
commit 2fb06af
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 33 deletions.
diff --git a/README.html b/README.html
@@ -397,17 +397,16 @@ <h2>Export the Release</h2>
 $ svn export https://shflags.googlecode.com/svn/tags/1.0.0 shflags-1.0.0
 </pre>
 </div>
-<div class="section" id="create-tarball">
-<h2>Create Tarball</h2>
+<div class="section" id="create-the-tarball">
+<h2>Create the tarball</h2>
 <pre class="literal-block">
 $ tar cfz ../releases/shflags-1.0.0.tgz shflags-1.0.0
 </pre>
 </div>
-<div class="section" id="md5sum-the-tarball-and-sign-with-gpg">
-<h2>md5sum the Tarball and Sign With gpg</h2>
+<div class="section" id="sign-the-tarball-with-gpg">
+<h2>Sign the tarball with gpg</h2>
 <pre class="literal-block">
 $ cd ../releases
-$ md5sum shflags-1.0.0.tgz &gt;shflags-1.0.0.tgz.md5
 $ gpg --default-key kate.ward&#64;forestent.com --detach-sign shflags-1.0.0.tgz
 </pre>
 </div>
@@ -417,9 +416,10 @@ <h2>Post the release</h2>
 info (release, date, and MD5), and the release with GPG signature needs to
 uploaded.</p>
 </div>
-<div class="section" id="post-to-freshmeat">
-<h2>Post to Freshmeat</h2>
+<div class="section" id="post-to-the-web">
+<h2>Post to the Web</h2>
 <ul class="simple">
+<li><a class="reference external" href="http://shflags.googlecode.com/">http://shflags.googlecode.com/</a></li>
 <li><a class="reference external" href="http://freshmeat.net/">http://freshmeat.net/</a></li>
 </ul>
 </div>
@@ -444,7 +444,7 @@ <h2>Miscellaneous</h2>
 <!-- generate HTML using rst2html from Docutils of -->
 <!-- http://docutils.sourceforge.net/ -->
 <!--  -->
-<!-- vim:syntax=rst:textwidth=80 -->
+<!-- vim:fileencoding=latin1:ft=rst:spell:tw=80 -->
 <!-- $Revision$ -->
 </div>
 </div>

diff --git a/doc/CHANGES-1.0.txt b/doc/CHANGES-1.0.txt
@@ -40,6 +40,8 @@ getopt is found.
 
 Added the OS version to OS release for Solaris.
 
+Fixed flags_reset() so it unsets the default value environment vars.
+
 
 Changes with 1.0.2
 ------------------

diff --git a/doc/RELEASE_NOTES-1.0.3.txt b/doc/RELEASE_NOTES-1.0.3.txt
@@ -4,17 +4,17 @@ shFlags.sh 1.0.3 Release Notes
 
 Preface
 =======
-Copyright 2009 Kate Ward. All Rights Reserved.
+Copyright 2008-2009 Kate Ward. All Rights Reserved.
 Released under the LGPL (GNU Lesser General Public License)
-Author: Kate Ward (kate.ward@forestent.com)
+Author: kate.ward@forestent.com (Kate Ward)
 
 This document covers any known issues and workarounds for the stated release of
 shFlags.
 
 Release info
 ============
 
-This is a major bugfix release. The biggest fix is in how non-flag arguments are
+This is a major bug fix release. The biggest fix is in how non-flag arguments are
 made available to the script.
 
 Major changes

diff --git a/src/shflags b/src/shflags
@@ -78,7 +78,7 @@
 
 # return if FLAGS already loaded
 [ -n "${FLAGS_VERSION:-}" ] && return 0
-FLAGS_VERSION='1.0.3pre'
+FLAGS_VERSION='1.0.3'
 
 # return values
 FLAGS_TRUE=0
@@ -140,10 +140,10 @@ __FLAGS_OPTSTR_LONG=1
 __FLAGS_NULL='~'
 
 # flag info strings
-__FLAGS_INFO_DEFAULT_STR='default'
-__FLAGS_INFO_HELP_STR='help'
-__FLAGS_INFO_SHORT_STR='short'
-__FLAGS_INFO_TYPE_STR='type'
+__FLAGS_INFO_DEFAULT='default'
+__FLAGS_INFO_HELP='help'
+__FLAGS_INFO_SHORT='short'
+__FLAGS_INFO_TYPE='type'
 
 # flag lengths
 __FLAGS_LEN_SHORT=0
@@ -313,11 +313,11 @@ _flags_define()
   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
     # store flag information
     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
-    eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE_STR}=${_flags_type_}"
-    eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT_STR}=\
+    eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
+    eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
 \"${_flags_default_}\""
-    eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP_STR}=\"${_flags_help_}\""
-    eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT_STR}='${_flags_short_}'"
+    eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
+    eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
 
     # append flag name(s) to list of names
     __flags_longNames="${__flags_longNames}${_flags_name_} "
@@ -351,11 +351,11 @@ _flags_genOptStr()
   _flags_opts_=''
 
   for _flags_flag_ in ${__flags_longNames}; do
-    _flags_type_=`_flags_getFlagInfo ${_flags_flag_} ${__FLAGS_INFO_TYPE_STR}`
+    _flags_type_=`_flags_getFlagInfo ${_flags_flag_} ${__FLAGS_INFO_TYPE}`
     case ${_flags_optStrType_} in
       ${__FLAGS_OPTSTR_SHORT})
         _flags_shortName_=`_flags_getFlagInfo \
-            ${_flags_flag_} ${__FLAGS_INFO_SHORT_STR}`
+            ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
           # getopt needs a trailing ':' to indicate a required argument
@@ -406,7 +406,7 @@ _flags_getFlagInfo()
     # Because it doesn't (it will evaluate to an empty string) the logic will
     # try to find the _type variable of the _type variable, and so on. Not so
     # good ;-)
-    _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE_STR}"
+    _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
     eval "${_flags_strToEval_}"
     if [ "${_flags_type_}" = "${__FLAGS_TYPE_STRING}" ]; then
@@ -700,7 +700,7 @@ _flags_parseGetopt()
     # set new flag value
     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
         _flags_type_=`_flags_getFlagInfo \
-            "${_flags_name_}" ${__FLAGS_INFO_TYPE_STR}`
+            "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
     case ${_flags_type_} in
       ${__FLAGS_TYPE_BOOLEAN})
         if [ ${_flags_len_} -eq ${__FLAGS_LEN_LONG} ]; then
@@ -711,7 +711,7 @@ _flags_parseGetopt()
           fi
         else
           _flags_strToEval_="_flags_val_=\
-\${__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT_STR}}"
+\${__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}}"
           eval "${_flags_strToEval_}"
           if [ ${_flags_val_} -eq ${FLAGS_FALSE} ]; then
             eval "FLAGS_${_flags_name_}=${FLAGS_TRUE}"
@@ -913,13 +913,13 @@ flags_help()
       flags_boolStr_=''
 
       flags_default_=`_flags_getFlagInfo \
-          "${flags_name_}" ${__FLAGS_INFO_DEFAULT_STR}`
+          "${flags_name_}" ${__FLAGS_INFO_DEFAULT}`
       flags_help_=`_flags_getFlagInfo \
-          "${flags_name_}" ${__FLAGS_INFO_HELP_STR}`
+          "${flags_name_}" ${__FLAGS_INFO_HELP}`
       flags_short_=`_flags_getFlagInfo \
-          "${flags_name_}" ${__FLAGS_INFO_SHORT_STR}`
+          "${flags_name_}" ${__FLAGS_INFO_SHORT}`
       flags_type_=`_flags_getFlagInfo \
-          "${flags_name_}" ${__FLAGS_INFO_TYPE_STR}`
+          "${flags_name_}" ${__FLAGS_INFO_TYPE}`
 
       [ "${flags_short_}" != "${__FLAGS_NULL}" ] \
           && flags_flagStr_="-${flags_short_}"
@@ -978,7 +978,7 @@ flags_help()
   return ${FLAGS_TRUE}
 }
 
-# Reset all flags back to their default values.
+# Reset shflags back to an uninitialized state.
 #
 # Args:
 #   none
@@ -989,9 +989,10 @@ flags_reset()
   for flags_name_ in ${__flags_longNames}; do
     flags_strToEval_="unset FLAGS_${flags_name_}"
     for flags_type_ in \
-        ${__FLAGS_INFO_HELP_STR} \
-        ${__FLAGS_INFO_SHORT_STR} \
-        ${__FLAGS_INFO_TYPE_STR}
+        ${__FLAGS_INFO_DEFAULT} \
+        ${__FLAGS_INFO_HELP} \
+        ${__FLAGS_INFO_SHORT} \
+        ${__FLAGS_INFO_TYPE}
     do
       flags_strToEval_=\
 "${flags_strToEval_} __flags_${flags_name_}_${flags_type_}"