Ticket #146: 100_fix_bashisms.patch

File 100_fix_bashisms.patch, 2.7 KB (added by Patrick Winnertz, 15 years ago)

Added by email2trac

  • mc-4.6.2~git20080311/vfs/extfs/u7z

    diff -Nurwd orig/mc-4.6.2~git20080311/vfs/extfs/u7z mc-4.6.2~git20080311/vfs/extfs/u7z
    old new  
    4545        #first we check if we have old p7zip archive with prefix ./ in filename 
    4646        $P7ZIP l "$1" "$2" | grep -q "0 files" && \ 
    4747        EXFNAME=*./"$2" || EXFNAME="$2" 
    48         $P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL &> /dev/null && \ 
    49         { echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; } 
     48        $P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \ 
     49        { printf "Function not implemented...\n7z cannot delete from solid archive.\n" >&2 ; exit 1 ; } 
    5050} 
    5151 
    5252mcu7zip_rmdir () 
     
    5454        #first we check if we have old p7zip archive with prefix ./ in filename 
    5555        $P7ZIP l "$1" "$2" | grep -q "0 files" && \ 
    5656        EXFNAME=*./"$2" || EXFNAME="$2" 
    57         $P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL &> /dev/null && \ 
    58         { echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; } 
     57        $P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \ 
     58        { printf "Function not implemented...\n7z cannot delete from solid archive.\n" >&2 ; exit 1 ; } 
    5959} 
    6060 
    6161# override any locale for dates 
  • mc-4.6.2~git20080311/vfs/extfs/uarj.in

    diff -Nurwd orig/mc-4.6.2~git20080311/vfs/extfs/uarj.in mc-4.6.2~git20080311/vfs/extfs/uarj.in
    old new  
    1616 
    1717mcarjfs_list () 
    1818{ 
    19  $ARJ v "$1" | @AWK@ -v uuid=${UID-0} ' 
     19 $ARJ v "$1" | @AWK@ -v uuid=$(id -ru) ' 
    2020  {  
    2121   if (($0 ~ /^[0-9]+\) .*/)||($0 ~ /^------------ ---------- ---------- -----/)){ 
    2222    if (filestr ~ /^[0-9]+\) .*/) { 
  • mc-4.6.2~git20080311/vfs/extfs/uha.in

    diff -Nurwd orig/mc-4.6.2~git20080311/vfs/extfs/uha.in mc-4.6.2~git20080311/vfs/extfs/uha.in
    old new  
    1010 
    1111mchafs_list () 
    1212{ 
    13     $HA lf "$1" 2>/dev/null | @AWK@ -v uid=${UID-0} ' 
     13    $HA lf "$1" 2>/dev/null | @AWK@ -v uid=$(id -ru) ' 
    1414/^===========/ {next} 
    1515{ 
    1616 if ($5="%" && $8~/DIR|ASC|HSC|CPY/) { 
  • mc-4.6.2~git20080311/vfs/extfs/uzoo.in

    diff -Nurwd orig/mc-4.6.2~git20080311/vfs/extfs/uzoo.in mc-4.6.2~git20080311/vfs/extfs/uzoo.in
    old new  
    2323mczoofs_list () 
    2424{ 
    2525    mklink "$1" 
    26     $ZOO lq "$ARCHIVE" | @AWK@ -v uid=${UID-0} ' 
     26    $ZOO lq "$ARCHIVE" | @AWK@ -v uid=$(id -ru) ' 
    2727/^[^\ ]/ { next } 
    2828{ 
    2929if (NF < 8)