From bfcc5ddf48bfd218250f5b28e1d2a8df34f11a37 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sat, 4 Apr 2015 19:24:21 +0200
Subject: [PATCH 1/2] Updated filwip.

---
 .../additional-files/install_plugins.sh       | 20 +++++++++++
 haiku-apps/filwip/filwip-1.0.0.recipe         | 35 +++++++++----------
 2 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100755 haiku-apps/filwip/additional-files/install_plugins.sh

diff --git a/haiku-apps/filwip/additional-files/install_plugins.sh b/haiku-apps/filwip/additional-files/install_plugins.sh
new file mode 100755
index 000000000..c331a1359
--- /dev/null
+++ b/haiku-apps/filwip/additional-files/install_plugins.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+settingsDir="$(finddir B_USER_SETTINGS_DIRECTORY)/FilWip/"
+
+pluginsSysDataDir="$(finddir B_SYSTEM_DATA_DIRECTORY)/FilWip"
+pluginsUserDataDir="$(finddir B_USER_DATA_DIRECTORY)/FilWip"
+
+if [ -d "$settingsDir/Plugins" ]; then
+	exit 0 # already has Plugins folder
+fi
+
+mkdir -p $settingsDir
+
+if [ -d "$pluginsSysDataDir/Plugins" ]; then
+	cp -rf $pluginsSysDataDir/Plugins "$settingsDir"
+elif [ -d "$pluginsUserDataDir/Plugins" ]; then
+	cp -rf $pluginsUserDataDir/Plugins "$settingsDir"
+else
+	exit 1 # couldn't find Plugins
+fi
diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
index dfc1e507a..94b1db4e7 100644
--- a/haiku-apps/filwip/filwip-1.0.0.recipe
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -1,29 +1,24 @@
-SUMMARY="An app to clean all temporary and unwanted files"
-DESCRIPTION="
-It cleans your hard disk of all unwanted files such as left-over temporary \
-files, cache files of internet sessions, logs, history files and the like. It \
-works with easy to write text files that include information about where the \
-files to delete are.
-" 
+SUMMARY="A tool to clean temporary and unwanted files"
+DESCRIPTION="It cleans your hard disk of unwanted files such as left-over \
+temporary files, cache files of internet sessions, logs, history files and \
+the like. It works with easy to write text files that include information \
+about where the files to delete are." 
 HOMEPAGE="https://sites.google.com/site/appfilwip/home"
-SRC_URI="git://github.com/HaikuArchives/FilWip.git#160ea1a"
-REVISION="4"
+SRC_URI="git://github.com/HaikuArchives/FilWip.git#f89df458da79e172ccf243e994b2989d5837c362"
+REVISION="5"
 
 LICENSE="SPL"
 COPYRIGHT="2002 Ramshankar"
 
 ARCHITECTURES="x86 x86_gcc2"
 
-
 PROVIDES="
 	filwip = $portVersion
 	app:FilWip = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
-
 BUILD_PREREQUIRES="
 	cmd:g++
 	cmd:xres
@@ -34,9 +29,8 @@ BUILD_REQUIRES="
 	makefile_engine
 	"
 
-USER_SETTINGS_FILES="
-	settings/FilWip_settings
-	"
+USER_SETTINGS_FILES="settings/FilWip directory keep-old"
+POST_INSTALL_SCRIPTS="$relativePostInstallDir/install_plugins.sh"
 
 BUILD()
 {
@@ -46,9 +40,14 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir/FilWip
-
-	cp -rf Plugins $appsDir/FilWip/Plugins
-	cp FilWip $appsDir/FilWip/FilWip
+	cp -rf Docs $appsDir/FilWip/Docs
+	cp -a FilWip $appsDir/FilWip
 
 	addAppDeskbarSymlink $appsDir/FilWip/FilWip
+
+	mkdir -p $dataDir/FilWip
+	cp -rf Plugins $dataDir/FilWip/Plugins
+
+	mkdir -p $postInstallDir
+	cp $portDir/additional-files/install_plugins.sh $postInstallDir
 }

From d05879cf3b43c19339e49c0642a179059a875766 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 9 Apr 2015 19:24:25 +0200
Subject: [PATCH 2/2] Quoting $pluginsUserDataDir/Plugins.

---
 haiku-apps/filwip/additional-files/install_plugins.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/filwip/additional-files/install_plugins.sh b/haiku-apps/filwip/additional-files/install_plugins.sh
index c331a1359..aaf032928 100755
--- a/haiku-apps/filwip/additional-files/install_plugins.sh
+++ b/haiku-apps/filwip/additional-files/install_plugins.sh
@@ -12,9 +12,9 @@ fi
 mkdir -p $settingsDir
 
 if [ -d "$pluginsSysDataDir/Plugins" ]; then
-	cp -rf $pluginsSysDataDir/Plugins "$settingsDir"
+	cp -rf "$pluginsSysDataDir/Plugins" "$settingsDir"
 elif [ -d "$pluginsUserDataDir/Plugins" ]; then
-	cp -rf $pluginsUserDataDir/Plugins "$settingsDir"
+	cp -rf "$pluginsUserDataDir/Plugins" "$settingsDir"
 else
 	exit 1 # couldn't find Plugins
 fi