diff --git a/ChangeLog b/ChangeLog index cea2d8079..b49ac01fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Tue Feb 9 20:52:19 1999 Norbert Warmuth + + * README.QNX: Deleted documention about mc.menu.qnx.diff. + +Tue Feb 9 20:46:07 1999 Norbert Warmuth + + * lib/mc.menu.qnx.diff: Deleted, it was merged with mc.menu. + +Tue Feb 9 20:32:39 1999 Norbert Warmuth + + * lib/mc.menu: Removed GNU tar'isms (option z). Removed option -o + from tar calls when extracting (according to my man page this option + is only useful when creating archieves). + +Tue Feb 9 20:28:15 1999 Norbert Warmuth + + * lib/mc.menu: Applied patch from root which + adds support for tar.bz2 and merges the support for freeze-compressed + tar files (tar.F) from mc.menu.qnx.diff. + Sun Feb 7 06:11:48 1999 Timur Bakeyev * Makefile.in: Change calls to xmkdir to mkinstalldirs - this is more diff --git a/README.QNX b/README.QNX index e9ead5f57..10620d952 100644 --- a/README.QNX +++ b/README.QNX @@ -141,20 +141,16 @@ lib/ 'Z' on 'tar.Z' and 'tar.z' files: '%f' -> '$1'. mc.ext.in.qnx.diff: - mc.menu.qnx.diff: QNX: modified 'mc.ext.in'. [tar -t: output to stderr,...] - QNX: modified 'mc.menu'. [tar is not GNU tar: doesn't know '-z',...] - - Support for '*.tar.F': 'freeze'-compressed tar files... - (No automatic install implemented: patches must be applied before + (No automatic install implemented: patch must be applied before running 'configure' [->mc.ext.in.qnx.diff!]; this patch can be not only QNX-specific...) Makefile.in: - 'mc.ext.in.qnx.diff' and 'mc.menu.qnx.diff' added to DISTLIB. + 'mc.ext.in.qnx.diff' added to DISTLIB. slang/ diff --git a/lib/Makefile.in b/lib/Makefile.in index 80e2fd590..ce06611a6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -18,7 +18,7 @@ LIBFILES_CONST = mc.hint mc.lib mc.menu TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \ Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \ - mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.menu.qnx.diff + mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff all: diff --git a/lib/mc.menu b/lib/mc.menu index 6541ce4e2..5cad3d689 100644 --- a/lib/mc.menu +++ b/lib/mc.menu @@ -26,7 +26,7 @@ shell_patterns=0 info = t d -3 Make a release of the current subdirectory +3 Make a release of the current subdirectory (tar.gz) Pwd=`basename %d /` echo -n "Name of the distribution file (without extension) [$Pwd]: " read tar @@ -35,6 +35,15 @@ shell_patterns=0 echo ../${tar}.tar.gz created. # tar=%{Name of the distribution file (without extension)} +4 Make a release of the current subdirectory (tar.bz2) + Pwd=`basename %d /` + echo -n "Name of the distribution file (without extension) [$Pwd]: " + read tar + if [ "$tar"x = x ]; then tar=$Pwd; fi + cd .. && tar chf - $Pwd | bzip2 -f --repetitive-best > $tar.tar.bz2 + echo ../${tar}.tar.bz2 created. +# tar=%{Name of the distribution file (without extension)} + = f \.c$ & t r + f \.c$ & t r & ! t t 5 Compile and link current .c file @@ -177,9 +186,15 @@ U Uudecode marked news articles (needs work) fi echo "Please test the output file before deleting anything" -=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$ & t r +=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$| f \.tar\.bz2$ & t r x Extract the contents of a compressed tar file - tar xzvf %f + unset EXT + echo %f|egrep -q "\.tar.bz2$" && EXT=tar_bz2 + if [ "$EXT" = "tar_bz2" ]; then + bunzip2 -c %f | tar xvf - + else + gzip -dc %f | tar xvf - + fi = t r + ! t t @@ -197,7 +212,22 @@ Y Gzip or gunzip tagged files gzip $DECOMP -v $i done -+ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ & t r & ! t t ++ ! t t +b Bzip2 or bunzip2 current file + unset DECOMP + echo %f|egrep -q "\.bz2$" && DECOMP=-d + bzip2 $DECOMP -v %f + ++ t t +B Bzip2 or bunzip2 tagged files + for i in %t + do + unset DECOMP + echo $i|egrep -q "\.bz2$" && DECOMP=-d + bzip2 $DECOMP -v $i + done + ++ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ & t r & ! t t z Extract compressed tar file to subdirectory unset D echo %f|egrep -q "\.tar.gz$" && EXT=tar_gz @@ -205,14 +235,29 @@ z Extract compressed tar file to subdirectory echo %f|egrep -q "\.tpz$" && EXT=tpz echo %f|egrep -q "\.tar.Z$" && EXT=tar_Z echo %f|egrep -q "\.tar.z$" && EXT=tar_z + echo %f|egrep -q "\.tar.bz2$" && EXT=tar_bz2 case $EXT in tar_gz) D="`basename %f .tar.gz`";; tgz) D="`basename %f .tgz`";; tpz) D="`basename %f .tpz`";; tar_Z) D="`basename %f .tar.Z`";; tar_z) D="`basename %f .tar.z`";; + tar_bz2) D="`basename %f .tar.bz2`";; esac - mkdir $D; cd $D && tar xvzof ../%f + if [ "$EXT" = "tar_bz2" ]; then + mkdir $D; cd $D && (bunzip2 -c ../%f | tar xvf -) + else + mkdir $D; cd $D && (gzip -dc ../%f | tar xvf -) + fi + ++ f \.tar.F$ & t r & ! t t +z Extract compressed tar file to subdirectory + unset D + echo %f|egrep -q "\.tar.F$" && EXT=tar_F + case $EXT in + tar_F) D="`basename %f .tar.F`";; + esac + mkdir $D; cd $D && (freeze -dc ../%f | tar xvf -) + t t Z Extract compressed tar files to subdirectories @@ -225,13 +270,67 @@ Z Extract compressed tar files to subdirectories echo $1|egrep -q "\.tpz$" && EXT=tpz echo $1|egrep -q "\.tar.Z$" && EXT=tar_Z echo $1|egrep -q "\.tar.z$" && EXT=tar_z + echo $1|egrep -q "\.tar.F$" && EXT=tar_F + echo $1|egrep -q "\.tar.bz2$" && EXT=tar_bz2 case $EXT in - tar_gz) D="`basename $1 .tar.gz`";; - tgz) D="`basename $1 .tgz`";; - tpz) D="`basename $1 .tpz`";; - tar_Z) D="`basename $1 .tar.Z`";; - tar_z) D="`basename $1 .tar.z`";; + tar_gz) D="`basename $1 .tar.gz`";; + tgz) D="`basename $1 .tgz`";; + tpz) D="`basename $1 .tpz`";; + tar_Z) D="`basename $1 .tar.Z`";; + tar_z) D="`basename $1 .tar.z`";; + tar_F) D="`basename $1 .tar.F`";; + tar_bz2) D="`basename $1 .tar.bz2`";; esac - mkdir $D; (cd $D && tar xvzof ../$1)||echo tag $1 >>$MC_CONTROL_FILE + case $EXT in + tar_gz|tgz|tpz|tar_Z|tar_z) mkdir $D; (cd $D && gzip -dc ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE;; + tar_F) mkdir $D; (cd $D && freeze -dc ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE;; + tar_bz2) mkdir $D; (cd $D && bunzip2 -c ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE + shift + done + ++ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t +c Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + unset D + echo %f|egrep -q "\.tgz$" && EXT=tgz + echo %f|egrep -q "\.tpz$" && EXT=tpz + echo %f|egrep -q "\.Z$" && EXT=Z + echo %f|egrep -q "\.z$" && EXT=z + echo %f|egrep -q "\.gz$" && EXT=gz + echo %f|egrep -q "\.bz2$" && EXT=bz2 + case $EXT in + tgz) D="`basename %f .tgz`.tar";; + tpz) D="`basename %f .tpz`.tar";; + gz) D="`basename %f .gz`";; + bz2) D="`basename %f .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + bunzip2 -v %f ; gzip -f9 -v $D + else + gunzip -v %f ; bzip2 -v --repetitive-best $D + fi + ++ t t +C Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + set %u + while [ -n "$1" ] + do + unset D + echo %f|egrep -q "\.tgz$" && EXT=tgz + echo %f|egrep -q "\.tpz$" && EXT=tpz + echo %f|egrep -q "\.Z$" && EXT=Z + echo %f|egrep -q "\.z$" && EXT=z + echo %f|egrep -q "\.gz$" && EXT=gz + echo %f|egrep -q "\.bz2$" && EXT=bz2 + case $EXT in + tgz) D="`basename $1 .tgz`.tar";; + tpz) D="`basename $1 .tpz`.tar";; + gz) D="`basename $1 .gz`";; + bz2) D="`basename $1 .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + (bunzip2 -v $1 ; gzip -f9 -v $D)||echo tag $1 >>$MC_CONTROL_FILE + else + (gunzip -v $1 ; bzip2 -v --repetitive-best $D)||echo tag $1 >>$MC_CONTROL_FILE + fi shift done diff --git a/lib/mc.menu.qnx.diff b/lib/mc.menu.qnx.diff deleted file mode 100644 index 8eebe4116..000000000 --- a/lib/mc.menu.qnx.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- mc.menu Mon May 18 13:27:26 1998 -+++ mc.menu.qnx Mon May 18 13:25:01 1998 -@@ -179,7 +179,11 @@ - - =+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$ & t r - x Extract the contents of a compressed tar file -- tar xzvf %f -+ gzip -dc %f | tar xvf - -+ -+=+ f \.tar\.F$ & t r -+x Extract the contents of a compressed tar file -+ freeze -dc %f | tar xvf - - - = t r - + ! t t -@@ -212,7 +216,16 @@ - tar_Z) D="`basename %f .tar.Z`";; - tar_z) D="`basename %f .tar.z`";; - esac -- mkdir $D; cd $D && tar xvzof ../%f -+ mkdir $D; cd $D && (gzip -dc ../%f | tar xvof -) -+ -++ f \.tar.F$ & t r & ! t t -+z Extract compressed tar file to subdirectory -+ unset D -+ echo %f|egrep -q "\.tar.F$" && EXT=tar_F -+ case $EXT in -+ tar_F) D="`basename %f .tar.F`";; -+ esac -+ mkdir $D; cd $D && (freeze -dc ../%f | tar xvof -) - - + t t - Z Extract compressed tar files to subdirectories -@@ -225,13 +238,18 @@ - echo $1|egrep -q "\.tpz$" && EXT=tpz - echo $1|egrep -q "\.tar.Z$" && EXT=tar_Z - echo $1|egrep -q "\.tar.z$" && EXT=tar_z -+ echo $1|egrep -q "\.tar.F$" && EXT=tar_F - case $EXT in - tar_gz) D="`basename $1 .tar.gz`";; - tgz) D="`basename $1 .tgz`";; - tpz) D="`basename $1 .tpz`";; - tar_Z) D="`basename $1 .tar.Z`";; - tar_z) D="`basename $1 .tar.z`";; -+ tar_F) D="`basename $1 .tar.F`";; -+ esac -+ case $EXT in -+ tar_gz|tgz|tpz|tar_Z|tar_z) mkdir $D; (cd $D && (gzip -dc ../$1 | tar xvof -))||echo tag $1 >>$MC_CONTROL_FILE;; -+ tar_F) mkdir $D; (cd $D && (freeze -dc ../$1 | tar xvof -))||echo tag $1 >>$MC_CONTROL_FILE;; - esac -- mkdir $D; (cd $D && tar xvzof ../$1)||echo tag $1 >>$MC_CONTROL_FILE - shift - done