[patch] Patch to run package as a normal user

teleview-0.40.patch (text/plain), 2.50 KB, created by Peter GAAL on 2009-04-07 17:57:24 UTC

--- org/install.sh	2006-02-07 12:43:06.000000000 +0100
+++ teleview-0.40/install.sh	2009-04-04 22:31:28.000000000 +0200
@@ -17,12 +17,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 user=`whoami`
-confpf="/home/"$user"/.teleview"
-instdir="/home/"$user"/teleview"
+confpf=~/.teleview
+instdir=~/teleview
 
 echo "Teleview Installer"
 echo "=================="
-echo "Bitte lesen Sie die readme-Datei für Systemvoraussetzungen"
 echo ""
 
 if [ "$user" == "root" ] 
@@ -42,17 +41,20 @@
 		mkdir $confpf
 	fi
 
+	if [ -e $confpf/teleview.conf ]
+		then
+		echo "rette alte Konfiguration nach $confpf/teleview.conf"
+		cp -f $confpf/teleview.conf $confpf/teleview.conf.old
+	fi
+
 	echo "kopiere teleview Daten..."	
-	cp teleview.conf $confpf
-	cp teleview.jar $instdir
-	cp *.png $instdir
-	cp *.jpg $instdir
-	cp readme $instdir
-	cp copying $instdir
-	cp teleview.html $instdir
-	cp uninstall.sh $instdir
-	cp testbild.gif $instdir
-	sudo cp teleview-start /usr/bin
+	cp -f /usr/share/teleview/teleview.conf $confpf
+	cp -f /usr/share/teleview/teleview.jar $instdir
+	cp -f /usr/share/teleview/*.png $instdir
+	cp -f /usr/share/teleview/*.jpg $instdir
+	cp -f /usr/share/teleview/teleview.html $instdir
+	cp -f /usr/share/teleview/uninstall.sh $instdir
+	cp -f /usr/share/teleview/testbild.gif $instdir
 	echo "Installation beendet"
 	echo ""
 	echo "Starten Sie teleview durch Aufruf" 
--- org/teleview-start	2006-02-07 09:19:40.000000000 +0100
+++ teleview-0.40/teleview-start	2009-04-04 22:32:04.000000000 +0200
@@ -1,13 +1,18 @@
 #!/bin/bash
 # teleview start
 
-user=`whoami`
-instdir="/home/"$user"/teleview/teleview.jar"
-TEMP="/tmp/tarif*.gif"
+instdir=~/teleview/teleview.jar
+sharedir=/usr/share/teleview
+TEMP=(`ls -1 /tmp/tarif*.gif 2>/dev/null`)
+
+if [[ ! -e "$instdir" || $sharedir/.teleview -nt $instdir/.teleview ]]
+	then
+	"$sharedir/install.sh" || exit
+fi
 
 if [ -e "/tmp/tarif1.gif" ]
 	then
-	rm $TEMP
+	rm ${TEMP[*]}
 fi
 
 java -jar $instdir
--- org/uninstall.sh	2006-02-07 12:27:52.000000000 +0100
+++ teleview-0.40/uninstall.sh	2009-04-04 22:42:04.000000000 +0200
@@ -17,8 +17,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 user=`whoami`
-confpf="/home/"$user"/.teleview"
-instdir="/home/"$user"/teleview"
+confpf=~/.teleview
+instdir=~/teleview
 
 echo "Teleview Uninstaller"
 echo "===================="
@@ -37,7 +37,6 @@
 		rmdir $instdir
 		rm $confpf/*
 		rmdir $confpf
-		sudo rm /usr/bin/teleview-start
 		echo "Deinstallation abgeschlossen!"
 	fi
 fi