3 files changed, 21 insertions, 18 deletions
diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop b/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
deleted file mode 100644
index 5fb1028a87bc..000000000000
--- a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
+++ /dev/null
@@ -1,17 +0,0 @@
---- scripts/CrashPlanDesktop
-+++ scripts/CrashPlanDesktop
-@@ -5,9 +5,11 @@ SCRIPTDIR=$(dirname $SCRIPT)
- TARGETDIR="$SCRIPTDIR/.."
- export SWT_GTK3=0
- 
--. ${TARGETDIR}/install.vars
--. ${TARGETDIR}/bin/run.conf
-+. /usr/local/share/crashplan/install.vars
- 
- cd ${TARGETDIR}
- 
--${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+. bin/run.conf
-+${LOGDIR=/var/log/crashplan}
-+
-+${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${LOGDIR}/ui_output.log 2> ${LOGDIR}/ui_error.log &
diff --git a/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop
new file mode 100644
index 000000000000..79fb91e7ac6d
--- /dev/null
+++ b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop
@@ -0,0 +1,20 @@
+--- scripts/CrashPlanDesktop.orig	2016-04-24 10:38:26 UTC
++++ scripts/CrashPlanDesktop
+@@ -5,12 +5,14 @@ SCRIPTDIR=$(dirname $SCRIPT)
+ TARGETDIR="$SCRIPTDIR/.."
+ export SWT_GTK3=0
+ 
+-. ${TARGETDIR}/install.vars
+-. ${TARGETDIR}/bin/run.conf
++. /usr/local/share/crashplan/install.vars
+ 
+ cd ${TARGETDIR}
+ 
+-if [ "_${VERSION_5_UI}" == "_true" ]; then
++. bin/run.conf
++${LOGDIR=/var/log/crashplan}
++
++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${LOGDIR}/ui_output.log 2> ${LOGDIR}/ui_error.log &
+ 	${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
+ else
+ 	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanEngine b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanEngine
index 2281c379549b..3e12174457d5 100644
--- a/sysutils/linux-crashplan/files/patch-CrashPlanEngine
+++ b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanEngine
@@ -1,4 +1,4 @@
---- scripts/CrashPlanEngine
+--- scripts/CrashPlanEngine.orig	2016-04-24 10:38:26 UTC
 +++ scripts/CrashPlanEngine
 @@ -11,7 +11,7 @@ standard_startup() {