Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/bin

diff --git a/sign_and_upload_debian_r b/sign_and_upload_debian_r
index c57b32aacaf81b0baa89252fc64788da9611b2d2..48aa70dfb9499d4accb584a83a8a8c0c65030f77 100755 (executable)
--- a/sign_and_upload_debian_r
+++ b/sign_and_upload_debian_r
@@ -7,8 +7,14 @@ fi;
 
 KEYID=9D05D0BE;
 
-ssh $C2DEBMACHINE 'find "$(ls -td ~/c2d/build_results*|head -n1)"' \
-    -type f -iname "'*.changes'"|xargs debsign -r $C2DEBMACHINE \
-    -k$KEYID; 
+if [ -z "$1" ]; then
+    BUILD_RESULTS="$(ssh $C2DEBMACHINE 'ls -td ~/c2d/build_results*|head -n1')"
+else
+    BUILD_RESULTS="$1"
+fi;
+
+
+ssh $C2DEBMACHINE "find '$BUILD_RESULTS' -type f -iname '*.changes'" | \
+    xargs debsign -r $C2DEBMACHINE  -k$KEYID;
 
-ssh $C2DEBMACHINE '(find "$(ls -td ~/c2d/build_results*|head -n1)" -type f -iname "*.changes"|xargs dupload --to debianr )'
+ssh $C2DEBMACHINE "(find '$BUILD_RESULTS' -type f -iname '*.changes'|xargs dupload --to debianr )"

diff --git a/txt2xls b/txt2xls
index ce3696590a687ba5543eb7d471c3eda3bbe3745a..89580044f9d9670e76de4d8ffdcc60bf51abbb36 100755 (executable)
--- a/txt2xls
+++ b/txt2xls
@@ -132,6 +132,11 @@ elsif ($options{ssv}) {
     $sep_char = ' ';
 }
 
+if (not @{$options{remove_name}}) {
+    $options{remove_name} = ['.+\/',
+                            ];
+}
+
 my %wb_formats = ();
 my $csv = Text::CSV->new({sep_char=>$sep_char});
 my $wb = Spreadsheet::WriteExcel->new(\*STDOUT);
@@ -147,7 +152,7 @@ for my $file (@ARGV) {
     }
     my $ws_name = $file;
     foreach my $remove (@{$options{remove_name}}) {
-       $ws_name =~ s{\Q$remove\E}{}g;
+        $ws_name =~ s{$remove}{}g;
     }
     $ws_name =~ s{\.[^\.]+$}{}g;
     $ws_name =~ s/_+/ /g;