You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2022/04/19 13:18:23 UTC

[whimsy] branch master updated: Tidy up

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new dff9c9bb Tidy up
dff9c9bb is described below

commit dff9c9bb4fe92fdeb09fe8729487022dc497b61b
Author: Sebb <se...@apache.org>
AuthorDate: Tue Apr 19 14:18:17 2022 +0100

    Tidy up
---
 www/test.cgi | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/www/test.cgi b/www/test.cgi
index b2e7f4cb..ca627228 100755
--- a/www/test.cgi
+++ b/www/test.cgi
@@ -15,7 +15,7 @@ end
 
 def puts_system(*cmd)
   puts ['$', cmd].join ' '
-  system(*cmd)
+  system(*cmd) or puts 'failed'
 end
 
 if ENV['SCRIPT_URL'] == '/members/test.cgi'
@@ -37,20 +37,21 @@ query = ENV['QUERY_STRING'] || ARGV[0]
 if query and not query.empty? and ENV['SCRIPT_URL'] == '/test.cgi'
     print "\n"
     puts_system('id')
-    puts_system('which','-a','svn')
-    puts_system('which','-a','git')
-    puts_system('svn','--version')
-    puts_system('which','-a','svnmucc')
-    puts_system('svnmucc','--version')
-    puts_system('which','-a','ruby')
-    puts_system('which','-a','ruby2.3.0')
-    puts_system('ruby','-v')
-    puts_system('gem','env')
-    puts_system('which','-a','gem')
+    puts_system('which', '-a', 'svn')
+    puts_system('svn', '--version')
+    puts_system('which', '-a', 'git')
+    puts_system('git', '--version')
+    puts_system('which', '-a', 'svnmucc')
+    puts_system('svnmucc', '--version')
+    puts_system('which', '-a', 'ruby')
+    puts_system('which', '-a', 'ruby2.3.0')
+    puts_system('ruby', '-v')
+    puts_system('gem', 'env')
+    puts_system('which', '-a',  'gem')
     puts_system('PATH=/usr/local/bin:$PATH which -a gem')
-    puts_system('service puppet status')
-    puts_system('git show --format="%h  %ci %cr" -s HEAD')
-    puts_system('git ls-remote origin master')
+    puts_system('service', 'puppet', 'status')
+    puts_system('git', 'show', '--format="%h,  %ci %cr"', '-s', 'HEAD')
+    puts_system('git', 'ls-remote', 'origin', 'master')
     wait=query.match(/^sleep=(\d+)$/)[1].to_i rescue 0
     if wait > 0
       print "\nWaiting #{wait} seconds ..."