--- mc/vfs/extfs/audio.in.orig 2006-07-26 02:22:59 +0600 +++ mc/vfs/extfs/audio.in 2008-02-24 15:39:38 +0500 @@ -11,12 +11,14 @@ set -e CDDB_SERVER="http://freedb.freedb.org" CDDB_HANDSHAKE="hello=user+localhost+mc+1.0&proto=1" CDDB_TIMEOUT=20 # in seconds +CDPARANOIA=cdparanoia +WGET=wget audiofs_list() { DATE=`date +"%b %d %H:%M"` echo "-r--r--r-- 1 0 0 0 $DATE CDDB" - cdparanoia -Q -d "$1" 2>&1 | grep '^[ 0-9][ 0-9][ 0-9]\.' | while read A B C + $CDPARANOIA -Q -d "$1" 2>&1 | grep '^[ 0-9][ 0-9][ 0-9]\.' | while read A B C do A=`echo "$A" | sed -e 's/\.//' -e 's/^\(.\)$/0\1/'` SIZE=`expr 44 + $B \* 2352` @@ -31,11 +33,11 @@ audiofs_copyout() if [ -z "$DISCID" ]; then exit 1 fi - RESPONSE=`wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | tee "$3" | @AWK@ '/^200/ { print $2,$3; }'` - wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> "$3" + RESPONSE=`$WGET -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | tee "$3" | @AWK@ '/^200/ { print $2,$3; }'` + $WGET -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> "$3" else TRACK=`echo "$2" | sed 's/track-0*//' | sed 's/\.wav//'` - cdparanoia -q -d "$1" "$TRACK" "$3" >/dev/null + $CDPARANOIA -q -d "$1" "$TRACK" "$3" >/dev/null fi } --- mc/vfs/extfs/iso9660.in.orig 2006-07-19 17:19:52 +0600 +++ mc/vfs/extfs/iso9660.in 2008-02-24 15:42:42 +0500 @@ -8,6 +8,8 @@ # tested to comply with isoinfo 2.0's output +ISOINFO=isoinfo + test_iso () { CHARSET=`locale charmap 2>/dev/null` if test -z "$CHARSET"; then @@ -15,15 +17,13 @@ test_iso () { fi if test -n "$CHARSET"; then CHARSET=`echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/'` - isoinfo -j $CHARSET -i /dev/null 2>&1 | grep "Unknown charset" >/dev/null && CHARSET= - fi - if test -n "$CHARSET"; then - JOLIET_OPT="-j $CHARSET -J" - else - JOLIET_OPT="-J" + $ISOINFO -j $CHARSET 2>&1 | fgrep -q "Unknown charset" && CHARSET= fi - ISOINFO="isoinfo -R" - isoinfo -d -i "$1" | grep "NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" + [ -n "$CHARSET" ] && JOLIET_OPT="-j $CHARSET -J" || JOLIET_OPT="-J" + # For Joliet with UCS level 1 reset using Joliet extension + $ISOINFO -d -i "$1" | fgrep -q "UCS level 1" && JOLIET_OPT= + $ISOINFO -d -i "$1" | fgrep -q "NO Joliet" || ISOINFO="$ISOINFO $JOLIET_OPT" + $ISOINFO -d -i "$1" | fgrep -q "NO Rock Ridge" || ISOINFO="$ISOINFO -R" } mcisofs_list () { --- mc/vfs/extfs/rpm.orig 2006-11-01 15:30:26 +0500 +++ mc/vfs/extfs/rpm 2008-02-24 15:47:15 +0500 @@ -25,10 +25,6 @@ else RPM="rpm" fi RPM2CPIO="rpm2cpio" -SED="sed" -# Surround the whole filename with single quotes and handle specially -# \', ' and \ at the end of the string. -SEDCMD="s/\\(\\\\\\?\\)'/'\\1\\1\\\\''/g;s/\\\\\$/'\\\\\\\\'/;s/^/'/;s/\$/'/" mcrpmfs_list () { @@ -38,13 +34,12 @@ mcrpmfs_list () if test -z "$MCFASTRPM"; then MCFASTRPM=$MCFASTRPM_DFLT fi - f="`echo "$1" | $SED "$SEDCMD"`" FILEPREF="-r--r--r-- 1 root root " - DESC=`$RPM -qip "$f" 2>/dev/null` || { + DESC=`$RPM -qip "$1" 2>/dev/null` || { echo "$FILEPREF 0 "`date +"%b %d %H:%M"`" ERROR" exit 1 } - DATE=`$RPM -qp --qf "%{BUILDTIME:date}\n" "$f" | cut -c 5-11,21-24` + DATE=`$RPM -qp --qf "%{BUILDTIME:date}\n" "$1" | cut -c 5-11,21-24` HEADERSIZE=`echo "$DESC" | wc -c` echo "-r--r--r-- 1 root root $HEADERSIZE $DATE HEADER" echo "-r-xr-xr-x 1 root root 39 $DATE INSTALL" @@ -55,25 +50,25 @@ mcrpmfs_list () echo "$FILEPREF 0 $DATE INFO/BUILDHOST" echo "$FILEPREF 0 $DATE INFO/SOURCERPM" if test "$MCFASTRPM" = 0 ; then - test "`$RPM -qp --qf \"%{DISTRIBUTION}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{DISTRIBUTION}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/DISTRIBUTION" - test "`$RPM -qp --qf \"%{VENDOR}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{VENDOR}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/VENDOR" - test "`$RPM -qp --qf \"%{DESCRIPTION}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{DESCRIPTION}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/DESCRIPTION" - test "`$RPM -qp --qf \"%{SUMMARY}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{SUMMARY}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/SUMMARY" - if test "`$RPM -qp --qf \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\" \"$f\"`" != "(none)(none)(none)(none)(none)"; then + if test "`$RPM -qp --qf \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\" \"$1\"`" != "(none)(none)(none)(none)(none)"; then echo "dr-xr-xr-x 1 root root 0 $DATE INFO/SCRIPTS" - test "`$RPM -qp --qf \"%{RPMTAG_PREIN}\" \"$f\"`" = '(none)' || + test "`$RPM -qp --qf \"%{RPMTAG_PREIN}\" \"$1\"`" = '(none)' || echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREIN" - test "`$RPM -qp --qf \"%{RPMTAG_POSTIN}\" \"$f\"`" = '(none)' || + test "`$RPM -qp --qf \"%{RPMTAG_POSTIN}\" \"$1\"`" = '(none)' || echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTIN" - test "`$RPM -qp --qf \"%{RPMTAG_PREUN}\" \"$f\"`" = '(none)' || + test "`$RPM -qp --qf \"%{RPMTAG_PREUN}\" \"$1\"`" = '(none)' || echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN" - test "`$RPM -qp --qf \"%{RPMTAG_POSTUN}\" \"$f\"`" = '(none)' || + test "`$RPM -qp --qf \"%{RPMTAG_POSTUN}\" \"$1\"`" = '(none)' || echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN" - test "`$RPM -qp --qf \"%{VERIFYSCRIPT}\" \"$f\"`" = '(none)' || + test "`$RPM -qp --qf \"%{VERIFYSCRIPT}\" \"$1\"`" = '(none)' || echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT" echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL" fi @@ -91,17 +86,17 @@ mcrpmfs_list () echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL" fi if test "$MCFASTRPM" = 0 ; then - test "`$RPM -qp --qf \"%{PACKAGER}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{PACKAGER}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/PACKAGER" - test "`$RPM -qp --qf \"%{URL}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{URL}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/URL" - test "`$RPM -qp --qf \"%{SERIAL}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{SERIAL}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/SERIAL" - test "`$RPM -qp --qf \"%{COPYRIGHT}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{COPYRIGHT}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/COPYRIGHT" - test "`$RPM -qp --qf \"%{EPOCH}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{EPOCH}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/EPOCH" - test "`$RPM -qp --qf \"%{LICENSE}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{LICENSE}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/LICENSE" else echo "$FILEPREF 0 $DATE INFO/PACKAGER" @@ -116,15 +111,15 @@ mcrpmfs_list () echo "$FILEPREF 0 $DATE INFO/OS" echo "$FILEPREF 0 $DATE INFO/SIZE" if test "$MCFASTRPM" != 0 ; then - $RPM -qp --qf "[%{REQUIRENAME}\n]" "$f" | grep "(none)" > /dev/null || + $RPM -qp --qf "[%{REQUIRENAME}\n]" "$1" | grep "(none)" > /dev/null || echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" - $RPM -qp --qf "[%{OBSOLETES}\n]" "$f" | grep "(none)" > /dev/null || + $RPM -qp --qf "[%{OBSOLETES}\n]" "$1" | grep "(none)" > /dev/null || echo "$FILEPREF 0 $DATE INFO/OBSOLETES" - $RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null || + $RPM -qp --qf "[%{PROVIDES}\n]" "$1" | grep "(none)" > /dev/null || echo "$FILEPREF 0 $DATE INFO/PROVIDES" - $RPM -qp --qf "[%{CONFLICTS}\n]" "$f" | grep "(none)" > /dev/null || + $RPM -qp --qf "[%{CONFLICTS}\n]" "$1" | grep "(none)" > /dev/null || echo "$FILEPREF 0 $DATE INFO/CONFLICTS" - test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" || + test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$1\"`" = "(none)" || echo "$FILEPREF 0 $DATE INFO/CHANGELOG" else echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" @@ -139,42 +134,41 @@ mcrpmfs_list () mcrpmfs_copyout () { - f="`echo "$1" | $SED "$SEDCMD"`" case "$2" in - HEADER) $RPM -qip "$f" > "$3"; exit 0;; + HEADER) $RPM -qip "$1" > "$3"; exit 0;; INSTALL) echo "# Run this to install this RPM package" > "$3"; exit 0;; UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;; - ERROR) $RPM -qip "$f" > /dev/null 2> "$3"; exit 0;; - INFO/NAME-VERSION-RELEASE) $RPM -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$f" > "$3"; exit 0;; - INFO/RELEASE) $RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit 0;; - INFO/GROUP) $RPM -qp --qf "%{GROUP}\n" "$f" > "$3"; exit 0;; - INFO/DISTRIBUTION) $RPM -qp --qf "%{DISTRIBUTION}\n" "$f" > "$3"; exit 0;; - INFO/VENDOR) $RPM -qp --qf "%{VENDOR}\n" "$f" > "$3"; exit 0;; - INFO/BUILDHOST) $RPM -qp --qf "%{BUILDHOST}\n" "$f" > "$3"; exit 0;; - INFO/SOURCERPM) $RPM -qp --qf "%{SOURCERPM}\n" "$f" > "$3"; exit 0;; - INFO/DESCRIPTION) $RPM -qp --qf "%{DESCRIPTION}\n" "$f" > "$3"; exit 0;; - INFO/PACKAGER) $RPM -qp --qf "%{PACKAGER}\n" "$f" > "$3"; exit 0;; - INFO/URL) $RPM -qp --qf "%{URL}\n" "$f" >"$3"; exit 0;; - INFO/BUILDTIME) $RPM -qp --qf "%{BUILDTIME:date}\n" "$f" >"$3"; exit 0;; - INFO/SERIAL) $RPM -qp --qf "%{SERIAL}\n" "$f" >"$3"; exit 0;; - INFO/COPYRIGHT) $RPM -qp --qf "%{COPYRIGHT}\n" "$f" >"$3"; exit 0;; - INFO/EPOCH) $RPM -qp --qf "%{EPOCH}\n" "$f" >"$3"; exit 0;; - INFO/LICENSE) $RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit 0;; - INFO/RPMVERSION) $RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3"; exit 0;; - INFO/REQUIRENAME) $RPM -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;; - INFO/PROVIDES) $RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/PREIN) $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/POSTIN) $RPM -qp --qf "%{RPMTAG_POSTIN}\n" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/PREUN) $RPM -qp --qf "%{RPMTAG_PREUN}\n" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/POSTUN) $RPM -qp --qf "%{RPMTAG_POSTUN}\n" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/VERIFYSCRIPT) $RPM -qp --qf "%{VERIFYSCRIPT}\n" "$f" >"$3"; exit 0;; - INFO/SCRIPTS/ALL) $RPM -qp --scripts "$f" > "$3"; exit 0;; - INFO/SUMMARY) $RPM -qp --qf "%{SUMMARY}\n" "$f" > "$3"; exit 0;; - INFO/OS) $RPM -qp --qf "%{OS}\n" "$f" > "$3"; exit 0;; - INFO/CHANGELOG) $RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$f" > "$3"; exit 0;; - INFO/SIZE) $RPM -qp --qf "%{SIZE} bytes\n" "$f" > "$3"; exit 0;; - INFO/OBSOLETES) $RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$f" > "$3"; exit 0;; - INFO/CONFLICTS) $RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$f" >"$3"; exit 0;; + ERROR) $RPM -qip "$1" > /dev/null 2> "$3"; exit 0;; + INFO/NAME-VERSION-RELEASE) $RPM -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$1" > "$3"; exit 0;; + INFO/RELEASE) $RPM -qp --qf "%{RELEASE}\n" "$1" > "$3"; exit 0;; + INFO/GROUP) $RPM -qp --qf "%{GROUP}\n" "$1" > "$3"; exit 0;; + INFO/DISTRIBUTION) $RPM -qp --qf "%{DISTRIBUTION}\n" "$1" > "$3"; exit 0;; + INFO/VENDOR) $RPM -qp --qf "%{VENDOR}\n" "$1" > "$3"; exit 0;; + INFO/BUILDHOST) $RPM -qp --qf "%{BUILDHOST}\n" "$1" > "$3"; exit 0;; + INFO/SOURCERPM) $RPM -qp --qf "%{SOURCERPM}\n" "$1" > "$3"; exit 0;; + INFO/DESCRIPTION) $RPM -qp --qf "%{DESCRIPTION}\n" "$1" > "$3"; exit 0;; + INFO/PACKAGER) $RPM -qp --qf "%{PACKAGER}\n" "$1" > "$3"; exit 0;; + INFO/URL) $RPM -qp --qf "%{URL}\n" "$1" >"$3"; exit 0;; + INFO/BUILDTIME) $RPM -qp --qf "%{BUILDTIME:date}\n" "$1" >"$3"; exit 0;; + INFO/SERIAL) $RPM -qp --qf "%{SERIAL}\n" "$1" >"$3"; exit 0;; + INFO/COPYRIGHT) $RPM -qp --qf "%{COPYRIGHT}\n" "$1" >"$3"; exit 0;; + INFO/EPOCH) $RPM -qp --qf "%{EPOCH}\n" "$1" >"$3"; exit 0;; + INFO/LICENSE) $RPM -qp --qf "%{LICENSE}\n" "$1" >"$3"; exit 0;; + INFO/RPMVERSION) $RPM -qp --qf "%{RPMVERSION}\n" "$1" >"$3"; exit 0;; + INFO/REQUIRENAME) $RPM -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$1" >"$3"; exit 0;; + INFO/PROVIDES) $RPM -qp --qf "[%{PROVIDES}\n]" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/PREIN) $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/POSTIN) $RPM -qp --qf "%{RPMTAG_POSTIN}\n" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/PREUN) $RPM -qp --qf "%{RPMTAG_PREUN}\n" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/POSTUN) $RPM -qp --qf "%{RPMTAG_POSTUN}\n" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/VERIFYSCRIPT) $RPM -qp --qf "%{VERIFYSCRIPT}\n" "$1" >"$3"; exit 0;; + INFO/SCRIPTS/ALL) $RPM -qp --scripts "$1" > "$3"; exit 0;; + INFO/SUMMARY) $RPM -qp --qf "%{SUMMARY}\n" "$1" > "$3"; exit 0;; + INFO/OS) $RPM -qp --qf "%{OS}\n" "$1" > "$3"; exit 0;; + INFO/CHANGELOG) $RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$1" > "$3"; exit 0;; + INFO/SIZE) $RPM -qp --qf "%{SIZE} bytes\n" "$1" > "$3"; exit 0;; + INFO/OBSOLETES) $RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$1" > "$3"; exit 0;; + INFO/CONFLICTS) $RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$1" >"$3"; exit 0;; CONTENTS.cpio) $RPM2CPIO "$1" > "$3"; exit 0;; *) ;; @@ -183,10 +177,9 @@ mcrpmfs_copyout () mcrpmfs_run () { - f="`echo "$1" | $SED "$SEDCMD"`" case "$2" in - INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$f"; exit 0;; - UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$f"; exit 0;; + INSTALL) echo "Installing \"$1\""; $RPM -ivh "$1"; exit 0;; + UPGRADE) echo "Upgrading \"$1\""; $RPM -iUvh "$1"; exit 0;; esac }