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

List:       gobolinux-commits
Subject:    [gobolinux-commits] r3544 - in branches/hisham/Scripts: Functions
From:       hisham () svn ! gobolinux ! org
Date:       2008-08-14 0:48:01
Message-ID: 20080814004801.274FF8168 () oakdale ! dreamhost ! com
[Download RAW message or body]

Author: hisham
Date: 2008-08-13 17:48:00 -0700 (Wed, 13 Aug 2008)
New Revision: 3544

Added:
   branches/hisham/Scripts/Functions/LogTerse
Modified:
   branches/hisham/Scripts/Functions/OptionParser
   branches/hisham/Scripts/bin/CreatePackage
Log:
Add quiet mode, and remove old/broken features in CreatePackage


Added: branches/hisham/Scripts/Functions/LogTerse
===================================================================
--- branches/hisham/Scripts/Functions/LogTerse	                        (rev 0)
+++ branches/hisham/Scripts/Functions/LogTerse	2008-08-14 00:48:00 UTC (rev 3544)
@@ -0,0 +1,20 @@
+#!/bin/bash (source)
+
+export logMode="Terse"
+export logLevel=${logLevelTerse}
+
+eval "exec $questionFD>&-"
+eval "exec $verboseFD>&-"
+eval "exec $normalFD>&-"
+eval "exec $terseFD>&-"
+eval "exec $errorFD>&-"
+eval "exec $debugFD>&-"
+eval "exec $logFD>&-"
+
+eval "exec $questionFD<&2"
+eval "exec $verboseFD>/dev/null"
+eval "exec $normalFD>/dev/null"
+eval "exec $terseFD<&2"
+eval "exec $errorFD<&2"
+eval "exec $debugFD>/dev/null"
+eval "exec $logFD>/dev/null"

Modified: branches/hisham/Scripts/Functions/OptionParser
===================================================================
--- branches/hisham/Scripts/Functions/OptionParser	2008-08-12 05:31:36 UTC (rev 3543)
+++ branches/hisham/Scripts/Functions/OptionParser	2008-08-14 00:48:00 UTC (rev 3544)
@@ -988,6 +988,9 @@
    if Boolean "verbose"
    then Import LogVerbose
    fi
+   if Boolean "quiet"
+   then Import LogTerse
+   fi
    if [ "$helpOnNoArguments" -a -z "$(Arg 1)" ]
    then Show_Help
    fi
@@ -997,3 +1000,4 @@
 Add_Option_Boolean "h" "help" "Show this help."
 Add_Option_Boolean "" "version" "Show program version."
 Add_Option_Boolean "v" "verbose" "Enable verbose mode."
+Add_Option_Boolean "" "quiet" "Enable quiet mode."
\ No newline at end of file

Modified: branches/hisham/Scripts/bin/CreatePackage
===================================================================
--- branches/hisham/Scripts/bin/CreatePackage	2008-08-12 05:31:36 UTC (rev 3543)
+++ branches/hisham/Scripts/bin/CreatePackage	2008-08-14 00:48:00 UTC (rev 3544)
@@ -12,13 +12,7 @@
 scriptDescription="Make a GoboLinux package."
 scriptCredits="Copyright (C) 2002-2003 Hisham Muhammad - Released under the GNU \
GPL."  scriptUsage="<directory>"
-Add_Option_Boolean "b" "bzip2" "Compress using bzip2"
-Add_Option_Boolean "g" "gzip" "Compress using gzip"
-Add_Option_Boolean "p" "personal-backup" "Use personal backup mode.  Do NOT use for \
                public distribution"
-Add_Option_Boolean "d" "devel-version" "Obsoleted"
-Add_Option_Entry   "n" "new-version" "Obsoleted" ""
-Add_Option_Boolean "k" "keep" "Obsoleted"
-Add_Option_Boolean "S" "no-sign" "Do not sign package"
+Add_Option_Boolean "s" "sign" "Sign package"
 Add_Option_Boolean "V" "no-verify" "Do not verify package"
 Add_Option_Entry   "t" "target-directory" "Create the package archive inside the \
passed directory (instead of '.')" ""  
@@ -72,8 +66,7 @@
 then revstring="-`cat $revfile`"
 fi
 
-packagefile="${package}--${versionnumber}${revstring}--${architecture}.tar"
-Boolean "personal-backup" && \
packagefile="$package--$versionnumber-PersonalBackup--$architecture.tar" \
+packagefile="${package}--${versionnumber}${revstring}--${architecture}.tar.bz2"  
 [ -e "$package/Settings" ] && anysettings="$package/Settings"
 
@@ -96,20 +89,20 @@
    result="$?"
    if [ $result -eq 0 ]
    then
-      Set_Boolean "no-sign"	# Use existing signature
+      Set_Boolean sign off # Use existing signature
    elif [ $result -eq 2 ]
    then
-      Set_Boolean "no-sign"	# No GnuPG.  Can't resign
+      Set_Boolean sign off # No GnuPG.  Can't resign
    elif [ $result -eq 4 ] || [ $result -eq 5 ]
    then
-      Boolean "no-sign" || Ask_Continue "No existing sig.  Re-sign?"
+      Boolean sign off || Ask_Continue "No existing sig.  Re-sign?"
    else
-      Die "Unable to verify package.  Do not redistribute"
+      Die "Unable to verify package; package not created."
    fi
 fi
 
 writegpgwarning=""
-if ! Boolean "no-sign"
+if Boolean sign
 then
    SignProgram $sign_opts "$package" "$versionnumber"
    result="$?"
@@ -137,27 +130,16 @@
    Quiet rm -- "$package/$versionnumber/share"
 fi
 
-
 [ "$tree_symlinked" = "yes" ] && Quiet pushd `RealPath \
                ${goboPrograms}/$package/$versionnumber`/../..
-if { Boolean "personal-backup" ;} && [ "$anysettings" ]
-then
-   ListProgramFiles --path --null ${package} ${versionnumber} | tar cvpf \
                "$targetdir/$packagefile" --null --files-from - --no-recursion 1>&2
-   [ "$tree_symlinked" = "yes" ] && Quiet popd
-   
-   # would make sense as personal-backup.  CJC
-   Boolean "personal-backup" && [ "$anysettings" ] && tar rhvpf \
                "$targetdir/$packagefile" "$package/Settings" 1>&2
-   Boolean "gzip" && gzip -f "$targetdir/$packagefile" || bzip2 -f \
                "$targetdir/$packagefile"
-else
-   Boolean "gzip" && option="z" || option="j"
-   Boolean "gzip" && extension="gz" || extension="bz2"
-   ListProgramFiles --path --null ${package} ${versionnumber} | tar cvpf$option \
                "$targetdir/$packagefile".$extension --null --files-from - \
                --no-recursion 1>&2
-   [ "$tree_symlinked" = "yes" ] && Quiet popd
-fi
 
-size=`ls -l "$targetdir/$packagefile".* | awk '{ print $5 }'`
+ListProgramFiles --path --null ${package} ${versionnumber} | tar cjvpf \
"$targetdir/$packagefile" --null --files-from - --no-recursion >&$verboseFD \
2>&$errorFD +
+[ "$tree_symlinked" = "yes" ] && Quiet popd
+
+size=`ls -l "$targetdir/$packagefile" | awk '{ print $5 }'`
 Log_Verbose "Packaged $package, version $versionnumber - $size bytes."
 
-echo "$targetdir/$packagefile.$extension"
+Log_Normal "$targetdir/$packagefile"
 
 if [ "$writegpgwarning" != "" ]
 then Log_Terse "$writegpgwarning"

_______________________________________________
gobolinux-commits mailing list
gobolinux-commits@lists.gobolinux.org
http://lists.gobolinux.org/mailman/listinfo/gobolinux-commits


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