From 7ca6abed3fd3a29a3dca5c87e9c54b0a8f41d15b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 7 Nov 2011 01:15:55 +0100
Subject: [PATCH] bootrecover: more fixes for running as user instead of root

---
 bootrecover/bootrecover.kmdr |  4 ++--
 bootrecover/bootrecover.sh   | 15 +++++++++++----
 bootrecover/po/es.po         |  4 ++--
 bootrecover/po/it.po         |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/bootrecover/bootrecover.kmdr b/bootrecover/bootrecover.kmdr
index e83f7bf..aa512b1 100755
--- a/bootrecover/bootrecover.kmdr
+++ b/bootrecover/bootrecover.kmdr
@@ -305,7 +305,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -1115,7 +1115,7 @@ _EOF
 
 @if (@confirmBox.checked); then
    @dcop(@dcopid, KommanderIf, setEnabled(QString,bool), back, false)
-   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh -y @dcopid &amp;&gt; ~/.bootrecover.log")
+   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh ~/.bootrecover.conf @dcopid `whoami` &amp;&gt; ~/.bootrecover.log")
    @execBegin
       dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
    @execEnd
diff --git a/bootrecover/bootrecover.sh b/bootrecover/bootrecover.sh
index dc19db2..17bf2ea 100755
--- a/bootrecover/bootrecover.sh
+++ b/bootrecover/bootrecover.sh
@@ -3,11 +3,10 @@
 #
 # Released under the terms of the GNU GPLv3 License
 
-VERSION=0.6
+VERSION=0.7
 TEXTDOMAIN=bootrecover
 TEXTDOMAINDIR=/opt/kde3/share/locale/
 INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
 LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
 MOUNTPOINT=/mnt/install
 KERNEL_RELEASE=`uname -r`
@@ -72,15 +71,23 @@ Installation time: $TIME_ELAPSED minutes"
    done
 }
 
-DCOPID=$2
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
+
+INPUT_FILE=$1
+[ "$2" -a "$3" ] && DCOPID="--user $3 $2"
 
 echo $"\
 openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 dcop_write $"Starting installation..." 5
 
+[ $INPUT_FILE ] || {
+   echo $"Error: this script must be called by bootloader.kmdr; aborting." >&2
+   abort
+}
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort
diff --git a/bootrecover/po/es.po b/bootrecover/po/es.po
index 6f1c4fd..b831aca 100644
--- a/bootrecover/po/es.po
+++ b/bootrecover/po/es.po
@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL v3"
 
 #: _from_rc.cc:9
diff --git a/bootrecover/po/it.po b/bootrecover/po/it.po
index b8d1fcf..081dcd2 100644
--- a/bootrecover/po/it.po
+++ b/bootrecover/po/it.po
@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL v3"
 
 #: _from_rc.cc:9