Merge remote-tracking branch 'upstream/master'

modules/archive/README.md

@@ -27,7 +27,7 @@ installed:
   - *.lzma* requires `unlzma`.
   - *.Z* requires `uncompress`.
   - *.zip*, *.jar* requires `unzip`.
-  - *.rar* requires `unrar` or `rar`.
+  - *.rar* requires `rar` (needed for `archive` support), `unrar` or `lsar` and `unar`.
   - *.7z* requires `7za`.
   - *.deb* requires `ar`, `tar`.
 

modules/archive/functions/lsarchive

@@ -43,9 +43,11 @@ while (( $# > 0 )); do
       || lzcat "$1" | tar x${verbose:+v}f - ;;
     (*.tar) tar t${verbose:+v}f "$1" ;;
     (*.zip|*.jar) unzip -l${verbose:+v} "$1" ;;
-    (*.rar) unrar &> /dev/null \
+    (*.rar) ( (( $+commands[unrar] )) \
-      && unrar ${${verbose:+v}:-l} "$1" \
+      && unrar ${${verbose:+v}:-l} "$1" ) \
-      || rar ${${verbose:+v}:-l} "$1" ;;
+      || ( (( $+commands[rar] )) \
+      && rar ${${verbose:+v}:-l} "$1" ) \
+      || lsar ${verbose:+-l} "$1" ;;
     (*.7z) 7za l "$1" ;;
     (*)
       print "$0: cannot list: $1" >&2

modules/archive/functions/unarchive

@@ -57,9 +57,11 @@ while (( $# > 0 )); do
     (*.lzma) unlzma "$1" ;;
     (*.Z) uncompress "$1" ;;
     (*.zip|*.jar) unzip "$1" -d $extract_dir ;;
-    (*.rar) unrar &> /dev/null \
+    (*.rar) ( (( $+commands[unrar] )) \
-      && unrar x -ad "$1" \
+      && unrar x -ad "$1" ) \
-      || rar x -ad "$1" ;;
+      || ( (( $+commands[rar] )) \
+      && rar x -ad "$1" ) \
+      || unar -d "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"