* update install script, to be more compatibility

2 files changed, 31 insertions, 36 deletions

diff --git a/install-debian.sh b/install-debian.sh
index 0b5009b..2a50a9e 100755
--- a/install-debian.sh
+++ b/install-debian.sh
@@ -6,25 +6,15 @@
 
 XXVSOURCE=`pwd`
 
-lastchar()
-{
-    # return the last character of a string in $rval
-    if [ -z "$1" ]; then
-        # empty string
-        rval=""
-        return
-    fi
-    # wc puts some space behind the output this is why we need sed:
-    numofchar=`echo -n "$1" | wc -c | sed 's/ //g' `
-    # now cut out the last char
-    rval=`echo -n "$1" | cut -b $numofchar`
-}
+if [ ! -e /usr/share/man/man1 ] ; then
+  echo 'Install Manpage'
+  cp doc/xxvd.1 /usr/share/man/man1
+fi 
 
-echo 'Install Manpage'
-cp doc/xxvd.1 /usr/share/man/man1
-
-echo 'Logrotate'
-cp etc/logrotate.d/xxvd /etc/logrotate.d/xxvd
+if [ ! -e /etc/logrotate.d/xxvd ] ; then
+  echo 'Logrotate'
+  cp etc/logrotate.d/xxvd /etc/logrotate.d/xxvd
+fi 
 
 if [ ! -e /usr/bin/vdr2jpeg ] ; then
   echo 'install vdr2jpeg'
@@ -70,18 +60,23 @@ echo 'start mysql server'
 echo 'create Database'
 cat contrib/create-database.sql | mysql -u root
 
-echo 'DB connectstring write in config'
-echo '[General]' >> ~/.xxvd.cfg
-echo 'DSN=DBI:mysql:database=xxv;host=localhost;port=3306' >> ~/.xxvd.cfg
-echo 'PWD=xxv' >> ~/.xxvd.cfg
-echo 'USR=xxv' >> ~/.xxvd.cfg
+if [ ! -e "~/.xxvd.cfg" ]; then
+  echo 'DB connectstring write in config'
+  echo '[General]' >> ~/.xxvd.cfg
+  echo 'DSN=DBI:mysql:database=xxv;host=localhost;port=3306' >> ~/.xxvd.cfg
+  echo 'PWD=xxv' >> ~/.xxvd.cfg
+  echo 'USR=xxv' >> ~/.xxvd.cfg
+fi
 
-echo 'create Startscript'
-sed -e 's/FOLDER=\".+?\"/FOLDER=\"$XXVSOURCE\"/' etc/xxvd > /etc/init.d/xxvd
-chmod 775 /etc/init.d/xxvd
-RVV=`runlevel`
-lastchar "$RVV"
-ln -s /etc/init.d/xxvd "/etc/rc$rval.d/S90xxvd"
+if [ ! -e "/etc/init.d/xxvd" ]; then
+  echo 'create Startscript'
+  sed -e 's/FOLDER=\".+?\"/FOLDER=\"$XXVSOURCE\"/' etc/xxvd > /etc/init.d/xxvd
+  chmod a+x /etc/init.d/xxvd
+  RVV=`runlevel | cut -d " " -f 2`
+  if [ ! -e "/etc/rc$RVV.d/S90xxvd" ]; then
+    ln -s /etc/init.d/xxvd "/etc/rc$RVV.d/S90xxvd"
+  fi
+fi
 
 echo 'Start XXV'
 /etc/init.d/xxvd restart
diff --git a/install.sh b/install.sh
index 3cb30b6..aa0591c 100755
--- a/install.sh
+++ b/install.sh
@@ -66,7 +66,7 @@ LANGS="de"
 
 PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin
 
-function usage()
+usage()
 {
 	echo ""
 	echo "usage: $(basename $0) [-h] [-p] [-u]"
@@ -79,7 +79,7 @@ function usage()
 	exit 0
 }
 
-function killRunning()
+killRunning()
 {
 	local KILLED=0
 	ps a | grep xxvd | grep perl | grep -v grep | while read PID UNWANTED
@@ -92,7 +92,7 @@ function killRunning()
 }
 
 # $1 - the Perl module to check for.
-function checkPerlModule()
+checkPerlModule()
 {
 	[ -z "$1" ] && return 1
 
@@ -120,7 +120,7 @@ function checkPerlModule()
 	fi
 }
 
-function perlModules()
+perlModules()
 {
 	checkPerlModule CGI
 	checkPerlModule Compress::Zlib
@@ -158,7 +158,7 @@ function perlModules()
 	checkPerlModule XML::Simple
 }
 
-function makeDir()
+makeDir()
 {
 	[ -z "$1" ] && return 1
 	local DIR=$1
@@ -184,7 +184,7 @@ function makeDir()
 	return 0
 }
 
-function doInstall()
+doInstall()
 {
 	echo ""
 	echo "********* Installing xxv *************"
@@ -346,7 +346,7 @@ flush privileges;"
 	exit 0
 }
 
-function doUninstall()
+doUninstall()
 {
 	echo ""
 	echo "********* Uninstalling xxv *************"