[Xfce4-commits] <thunar-archive-plugin:master> Make "Extract Here" work again with file-roller (bug #3261).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 004169f794000160bd3001b6a3fa1076063aeaa2 (commit)
       from cee66d6486517658ad4ca04b832383c98c74c9a2 (commit)

commit 004169f794000160bd3001b6a3fa1076063aeaa2
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Jan 23 17:21:25 2011 +0100

    Make "Extract Here" work again with file-roller (bug #3261).
    
    "Extract Here" after DND is still broken with file-roller for a simple
    reason: file-roller's --extract-here always seems to assume the
    destination to be the working directory. Overriding this with
    --extract-to=some/other/folder does not work.

 scripts/file-roller.tap |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/scripts/file-roller.tap b/scripts/file-roller.tap
index 50c888e..c238c40 100644
--- a/scripts/file-roller.tap
+++ b/scripts/file-roller.tap
@@ -1,27 +1,28 @@
 #!/bin/sh
 #
+# vi:set et ai sw=2 sts=2 ts=2:
+# -
 # file-roller.tap - Wrapper script to create and extract archive files
 #                   in Thunar, via the thunar-archive-plugin, using the
 #                   file-roller archive manager.
 #
-# $Id$
+# Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+# Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
 #
-# Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
+# This program is free software; you can redistribute it and/or 
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of 
+# the License, or (at your option) any later version.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public 
+# License along with this program; if not, write to the Free 
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # determine the action and the folder, $@ then contains only the files
 action=$1; shift;
@@ -34,7 +35,7 @@ create)
 	;;
 
 extract-here)
-	exec file-roller "--extract-to=$folder" --force "$@"
+	exec file-roller "--extract-to=$(pwd)" --extract-here --force "$@"
 	;;
 
 extract-to)