From 821cda1b3faaae9462a25aed9c576d976c2a1c15 Mon Sep 17 00:00:00 2001
From: lucy <ne.tetewi@gmail.com>
Date: Wed, 16 Jul 2014 04:38:57 +0200
Subject: [PATCH] Use the `x` command for unrar and rar to preserve paths

unrar and rar will discard everything up to the file name when extracting
with `e`. This breaks extraction of archives that have files with duplicate
file names and ones where the paths are important. The `x` command
extracts with the full path instead.
---
 modules/archive/functions/unarchive | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/archive/functions/unarchive b/modules/archive/functions/unarchive
index 36fe85b6..4397b192 100644
--- a/modules/archive/functions/unarchive
+++ b/modules/archive/functions/unarchive
@@ -54,8 +54,8 @@ while (( $# > 0 )); do
     (*.Z) uncompress "$1" ;;
     (*.zip) unzip "$1" -d $extract_dir ;;
     (*.rar) unrar &> /dev/null \
-      && unrar e -ad "$1" \
-      || rar e -ad "$1" ;;
+      && unrar x -ad "$1" \
+      || rar x -ad "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"