diff --git a/configure.ac b/configure.ac index bc3a3ab5d..8faa6ec11 100644 --- a/configure.ac +++ b/configure.ac @@ -535,6 +535,7 @@ src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 +src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/urar diff --git a/src/vfs/extfs/helpers/.gitignore b/src/vfs/extfs/helpers/.gitignore index e23b9188a..8c9f1133d 100644 --- a/src/vfs/extfs/helpers/.gitignore +++ b/src/vfs/extfs/helpers/.gitignore @@ -17,6 +17,7 @@ s3+ ualz uar uarj +ucab uha ulha urar diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am index d48699fe5..8d53d2f2f 100644 --- a/src/vfs/extfs/helpers/Makefile.am +++ b/src/vfs/extfs/helpers/Makefile.am @@ -6,7 +6,7 @@ EXTFSCONFFILES = sfs.ini EXTFS_MISC = README README.extfs # Scripts hat don't need adaptation to the local system -EXTFS_CONST = bpp rpm trpm u7z ucab +EXTFS_CONST = bpp rpm trpm u7z # Scripts that need adaptation to the local system - source files EXTFS_IN = \ @@ -30,6 +30,7 @@ EXTFS_IN = \ uarc.in \ uarj.in \ uc1541.in \ + ucab.in \ uha.in \ ulha.in \ urar.in \ @@ -58,6 +59,7 @@ EXTFS_OUT = \ uarc \ uarj \ uc1541 \ + ucab \ uha \ ulha \ urar \ diff --git a/src/vfs/extfs/helpers/uace.in b/src/vfs/extfs/helpers/uace.in index 6b00f7a41..b383d4152 100644 --- a/src/vfs/extfs/helpers/uace.in +++ b/src/vfs/extfs/helpers/uace.in @@ -9,8 +9,6 @@ # # -# Define your awk -AWK=gawk # Define which archiver you are using with appropriate options ACE_LIST="unace l" ACE_GET="unace x" @@ -28,7 +26,7 @@ mc_ace_fs_list() UID=0 fi fi - $ACE_LIST "$1" | gawk -v uid=$UID ' + $ACE_LIST "$1" | @AWK@ -v uid=$UID ' BEGIN { Month="JanFebMarAprMayJunJulAugSepOctNovDec" } /%/ { split($1,date,".") diff --git a/src/vfs/extfs/helpers/uarc.in b/src/vfs/extfs/helpers/uarc.in index e3269cb09..8c1a00696 100644 --- a/src/vfs/extfs/helpers/uarc.in +++ b/src/vfs/extfs/helpers/uarc.in @@ -7,8 +7,6 @@ # # -# Define your awk -AWK=gawk # Define which archiver you are using with appropriate options ARC_LIST="arc v" ARC_GET="arc x" @@ -25,7 +23,7 @@ mc_arc_fs_list() UID=0 fi fi - $ARC_LIST "$1" | gawk -v uid=$UID ' + $ARC_LIST "$1" | @AWK@ -v uid=$UID ' BEGIN { } /^Name/ { next } /===/ { next } diff --git a/src/vfs/extfs/helpers/uc1541.in b/src/vfs/extfs/helpers/uc1541.in index a9620a167..842c1d1bf 100644 --- a/src/vfs/extfs/helpers/uc1541.in +++ b/src/vfs/extfs/helpers/uc1541.in @@ -12,8 +12,6 @@ # # -# Define your awk -AWK=gawk # Define which archiver you are using with appropriate options C1541="c1541" @@ -26,7 +24,7 @@ mc_c1541_fs_list() UID=0 fi fi - $C1541 "$1" -list | gawk -v uid=$UID ' + $C1541 "$1" -list | @AWK@ -v uid=$UID ' BEGIN { FS = "\"" } /No LINES!/ { next } /BLOCKS FREE/ { next } diff --git a/src/vfs/extfs/helpers/ucab b/src/vfs/extfs/helpers/ucab.in old mode 100755 new mode 100644 similarity index 91% rename from src/vfs/extfs/helpers/ucab rename to src/vfs/extfs/helpers/ucab.in index e6bded35a..252c8cab7 --- a/src/vfs/extfs/helpers/ucab +++ b/src/vfs/extfs/helpers/ucab.in @@ -4,7 +4,7 @@ CAB=cabextract mccabfs_list () { - $CAB -l "$1" | gawk -v uid=`id -un` -v gid=`id -gn` ' + $CAB -l "$1" | @AWK@ -v uid=`id -un` -v gid=`id -gn` ' BEGIN { flag=0 } /^-------/ { flag++; if (flag > 1) exit 0; next } {