clear trailing / from directory names in idb file

(This used to be commit f06bed256dfaf56bcfc1982df1d8bf8fe559f53b)

1 files changed, 15 insertions, 11 deletions

diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index 47e5d660531..fed2bacd051 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -94,15 +94,15 @@ print IDB "l 0000 root sys etc/rc0.d/K39samba packaging/SGI samba.sw.base symval
 print IDB "l 0000 root sys etc/rc2.d/S81samba packaging/SGI samba.sw.base symval(../init.d/samba)\n";
 
 @copyfile = grep (/^COPY/,@allfiles);
-print IDB "d 0755 root sys usr/relnotes/samba/ packaging/SGI samba.man.relnotes\n";
+print IDB "d 0755 root sys usr/relnotes/samba packaging/SGI samba.man.relnotes\n";
 print IDB "f 0644 root sys usr/relnotes/samba/@copyfile[0] @copyfile[0] samba.man.relnotes\n";
 print IDB "f 0644 root sys usr/relnotes/samba/legal_notice.html packaging/SGI/legal_notice.html samba.man.relnotes\n";
 print IDB "f 0644 root sys usr/relnotes/samba/samba-relnotes.html packaging/SGI/relnotes.html samba.man.relnotes\n";
 
-print IDB "d 0755 root sys usr/samba/ packaging/SGI samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba packaging/SGI samba.sw.base\n";
 print IDB "f 0444 root sys usr/samba/README packaging/SGI/README samba.sw.base\n";
 
-print IDB "d 0755 root sys usr/samba/bin/ packaging/SGI samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba/bin packaging/SGI samba.sw.base\n";
 while(@bins) {
   $nextfile = shift @bins;
   ($filename = $nextfile) =~ s/^.*\///;;
@@ -129,12 +129,14 @@ while(@bins) {
   }
 }
 
-print IDB "d 0755 root sys usr/samba/docs/ docs samba.man.doc\n";
+print IDB "d 0755 root sys usr/samba/docs docs samba.man.doc\n";
 while (@docs) {
   $nextfile = shift @docs;
   next if ($nextfile eq "CVS");
   ($junk,$file) = split(/\//,$nextfile,2);
   if (grep(/\/$/,$nextfile)) {
+    $file =~ s/\/$//;
+    $nextfile =~ s/\/$//;
     print IDB "d 0755 root sys usr/samba/docs/$file $nextfile samba.man.doc\n";
   }
   else {
@@ -143,7 +145,7 @@ while (@docs) {
 }
 
 print IDB "f 0755 root sys usr/samba/inetd.sh packaging/SGI/inetd.sh samba.sw.base\n";
-print IDB "d 0755 root sys usr/samba/lib/ packaging/SGI samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba/lib packaging/SGI samba.sw.base\n";
 if (@codepage) {
   print IDB "d 0755 root sys usr/samba/lib/codepages packaging/SGI samba.sw.base\n";
   while (@codepage) {
@@ -154,9 +156,9 @@ if (@codepage) {
 print IDB "f 0644 root sys usr/samba/lib/smb.conf packaging/SGI/smb.conf samba.sw.base config(update)\n";
 print IDB "f 0755 root sys usr/samba/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base\n";
 
-print IDB "d 0644 root sys usr/samba/private/ packaging/SGI samba.sw.base\n";
+print IDB "d 0644 root sys usr/samba/private packaging/SGI samba.sw.base\n";
 print IDB "f 0600 root sys usr/samba/private/smbpasswd packaging/SGI/smbpasswd samba.sw.base config(update)\n";
-print IDB "d 0755 root sys usr/samba/src/ packaging/SGI samba.src.samba\n";
+print IDB "d 0755 root sys usr/samba/src packaging/SGI samba.src.samba\n";
 @sorted = sort(@allfiles);
 while (@sorted) {
   $nextfile = shift @sorted;
@@ -165,6 +167,7 @@ while (@sorted) {
   next if grep(/source/,$nextfile) && ($ignores{$file});
   next if ($nextfile eq "CVS");
   if (grep(/\/$/,$nextfile)) {
+    $nextfile =~ s/\/$//;
     print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
   }
   else {
@@ -178,12 +181,13 @@ while (@sorted) {
 }
 
 print IDB "f 0755 root sys usr/samba/startswat.sh packaging/SGI/startswat.sh samba.sw.base\n";
-print IDB "d 0755 root sys usr/samba/swat/ packaging/SGI/swat samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba/swat packaging/SGI/swat samba.sw.base\n";
 while (@swatfiles) {
   $nextfile = shift @swatfiles;
   ($file = $nextfile) =~ s/^packaging\/SGI\/swat\///;
   next if !$file;
   if (grep(/\/$/,$file)) {
+    $file =~ s/\/$//;
     print IDB "d 0755 root sys usr/samba/swat/$file packaging/SGI/swat/$file samba.sw.base\n";
   }
   else {
@@ -191,11 +195,11 @@ while (@swatfiles) {
   }
 }
 
-print IDB "d 0755 root sys usr/samba/var/ packaging/SGI samba.sw.base\n";
-print IDB "d 0755 root sys usr/samba/var/locks/ packaging/SGI samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba/var packaging/SGI samba.sw.base\n";
+print IDB "d 0755 root sys usr/samba/var/locks packaging/SGI samba.sw.base\n";
 print IDB "f 0644 root sys usr/samba/var/locks/STATUS..LCK packaging/SGI/STATUS..LCK samba.sw.base\n";
 
-print IDB "d 0755 root sys usr/share/catman/u_man/ packaging/SGI samba.man.manpages\n";
+print IDB "d 0755 root sys usr/share/catman/u_man packaging/SGI samba.man.manpages\n";
 $olddirnum = "0";
 while (@catman) {
   $nextfile = shift @catman;