Changeset 27014 in webkit

Timestamp:

Oct 24, 2007, 8:51:10 PM (17 years ago)

Author:

ddkilzer

Message:

Refurbish update-webkit script.

Reviewed by Adam.

Scripts/update-webkit: Add -hhelp switch and usage statement. Check result of

GetOptions() call. Fix -qquiet switch to be passed to svn command properly. Use

multi-argument version of system() for flexibility and security. Check for existence
of Internal directory using -d test instead of -x.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit (modified) (2 diffs)

trunk/WebKitTools/ChangeLog ¶

@@ +1 @@
+2007-10-24  David Kilzer  <ddkilzer@webkit.org>
+
+        Refurbish update-webkit script.
+
+        Reviewed by Adam.
+
+        * Scripts/update-webkit: Add -h|--help switch and usage statement.  Check result of
+        GetOptions() call.  Fix -q|--quiet switch to be passed to svn command properly.  Use
+        multi-argument version of system() for flexibility and security.  Check for existence
+        of Internal directory using -d test instead of -x.
+
 2007-10-24  David Kilzer  <ddkilzer@webkit.org>
 

trunk/WebKitTools/Scripts/update-webkit ¶

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006, 2007 Apple Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32 +32 @@
 use FindBin;
 use lib $FindBin::Bin;
+use File::Basename;
 use Getopt::Long;
 use webkitdirs;
 
 # Handle options
-my $quiet ='';
-my $svnoptions = '';
-GetOptions('quiet|q' => \$quiet); 
-$svnoptions = '-q' if $quiet;
+my $quiet = '';
+my $showHelp;
+
+my $getOptionsResult = GetOptions(
+    'h|help'  => \$showHelp,
+    'q|quiet' => \$quiet,
+); 
+
+if (!$getOptionsResult || $showHelp) {
+    print STDERR <<__END__;
+Usage: @{[ basename($0) ]} [options]
+  -h|--help   show the help message
+  -q|--quiet  pass -q to svn update for quiet updates
+__END__
+    exit 1;
+}
+
+my @svnOptions = ();
+push @svnOptions, '-q' if $quiet;
 
 chdirWebKit();
 print "Updating OpenSource\n" unless $quiet;
-(system("svn $svnoptions up") == 0) or die;
+(system("svn", "update", @svnOptions) == 0) or die;
 if (isCygwin()) {
-    (system("perl WebKitTools/Scripts/update-webkit-auxiliary-libs") == 0) or die;
+    (system("perl", "WebKitTools/Scripts/update-webkit-auxiliary-libs") == 0) or die;
 }
 
-if (-x "../Internal") {
+if (-d "../Internal") {
     chdir("../Internal");
     print "Updating Internal\n" unless $quiet;
-    (system("svn $svnoptions up") == 0) or die;
+    (system("svn", "update", @svnOptions) == 0) or die;
 }