[Bps-public-commit] Shipwright branch, master, updated. 818410801983fe8caa8546c448e1b1a52bdcc429

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  818410801983fe8caa8546c448e1b1a52bdcc429 (commit)
      from  37f06e268eccbd902880f8ceacfba054ec03eedb (commit)

Summary of changes:
 share/etc/shipwright-utility |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 818410801983fe8caa8546c448e1b1a52bdcc429
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 22 15:07:37 2009 +0800

    make --switch default to uname, so --auto-switch is needless

diff --git a/share/etc/shipwright-utility b/share/etc/shipwright-utility
index 556a540..cb2f2e0 100755
--- a/share/etc/shipwright-utility
+++ b/share/etc/shipwright-utility
@@ -8,12 +8,11 @@ use Cwd;
 use Carp;
 use File::Find;
 my %args;
-GetOptions( \%args, 'install-links=s', 'switch=s', 'auto-switch', 'help' );
+GetOptions( \%args, 'install-links=s', 'switch:s', 'help' );
 
 my $USAGE = <<'END'
 run: ./tools/shipwright-utility --install-links /usr/local
 run: ./tools/shipwright-utility --switch ubuntu
-run: ./tools/shipwright-utility --auto-switch 
 
 options: 
 
@@ -22,11 +21,9 @@ help: print this usage
 install-links: link files in bin, sbin, or libexec to other places
     e.g. --install-links /usr/local
 
-switch: switch to the lib below as/$name
+switch: switch to the lib below as/$name, default is uname
     e.g. --switch ubuntu
 
-auto-switch: swith automatically by the uname
-
 END
   ;
 
@@ -52,7 +49,7 @@ elsif ( $args{'install-links'} ) {
         }
     }
 }
-elsif ( $args{'switch'} || $args{'auto-switch' } ) {
+elsif ( defined $args{'switch'} ) {
     my $name = $args{'switch'} || `uname 2>/dev/null`;
     chomp $name;
 

-----------------------------------------------------------------------