1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

fix problem with output file not being properly sorted

(This used to be commit d13678b079)
This commit is contained in:
Herb Lewis 1998-04-28 18:58:20 +00:00
parent b807469d40
commit 1a25f56066

View File

@ -121,8 +121,6 @@ while (@docs) {
next if ($nextfile eq "CVS"); next if ($nextfile eq "CVS");
($junk,$file) = split(/\//,$nextfile,2); ($junk,$file) = split(/\//,$nextfile,2);
if (grep(/\/$/,$nextfile)) { if (grep(/\/$/,$nextfile)) {
chop $nextfile;
chop $file;
print IDB "d 0755 root sys usr/samba/docs/$file $nextfile samba.man.doc\n"; print IDB "d 0755 root sys usr/samba/docs/$file $nextfile samba.man.doc\n";
} }
else { else {
@ -143,14 +141,14 @@ print IDB "f 0644 root sys usr/samba/lib/smb.conf packaging/SGI/smb.conf samba.s
print IDB "f 0755 root sys usr/samba/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base\n"; print IDB "f 0755 root sys usr/samba/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base\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";
while (@allfiles) { @sorted = sort(@allfiles);
$nextfile = shift @allfiles; while (@sorted) {
$nextfile = shift @sorted;
($file = $nextfile) =~ s/^.*\///; ($file = $nextfile) =~ s/^.*\///;
next if grep(/packaging\/SGI/& (/Makefile/ | /samba\.spec/ | /samba\.idb/),$nextfile); next if grep(/packaging\/SGI/& (/Makefile/ | /samba\.spec/ | /samba\.idb/),$nextfile);
next if grep(/source/,$nextfile) && ($ignores{$file}); next if grep(/source/,$nextfile) && ($ignores{$file});
next if ($nextfile eq "CVS"); next if ($nextfile eq "CVS");
if (grep(/\/$/,$nextfile)) { if (grep(/\/$/,$nextfile)) {
chop $nextfile;
print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n"; print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
} }
else { else {
@ -169,7 +167,6 @@ while (@swatfiles) {
($file = $nextfile) =~ s/^packaging\/SGI\/swat\///; ($file = $nextfile) =~ s/^packaging\/SGI\/swat\///;
next if !$file; next if !$file;
if (grep(/\/$/,$file)) { if (grep(/\/$/,$file)) {
chop $file;
print IDB "d 0755 root sys usr/samba/swat/$file packaging/SGI/swat/$file samba.sw.base\n"; print IDB "d 0755 root sys usr/samba/swat/$file packaging/SGI/swat/$file samba.sw.base\n";
} }
else { else {