X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fninjahelper.in;h=451f38978e91b56a959d89491e1bcd199b9c199a;hb=13893e6d255a0b3ff1ac2ffb74cff0652d2b61f4;hp=f0ad45a9685cc6d28fbafe883fefcaf35cee2638;hpb=13149b96008227bb11582fa0e0d59b727fd8d1bd;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/src/ninjahelper.in b/src/ninjahelper.in index f0ad45a..451f389 100755 --- a/src/ninjahelper.in +++ b/src/ninjahelper.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ #################################################### ## Functions @@ -187,24 +187,39 @@ if [ ! -r "$conffile" ]; then echo "Configuration file $conffile not found." exit 1 fi + +# find $scriptdir scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'` -if [ ! -n "$scriptdir" ]; then - echo "Cound not find entry 'scriptdirectory' in $conffile" - exit 1 -fi -if [ ! -d "$scriptdir" ]; then - echo "Script directory $scriptdir not found." - exit 1 +if [ -z "$scriptdir" ]; then + if [ -d "@datadir@" ]; then + scriptdir="@datadir@" + else + echo "Could not find entry 'scriptdirectory' in $conffile" + exit 1 + fi +else + if [ ! -d "$scriptdir" ]; then + echo "Script directory $scriptdir not found." + exit 1 + fi fi + +# find $libdir libdir=`grep libdirectory $conffile | awk '{print $3}'` -if [ ! -n "$libdir" ]; then - echo "Cound not find entry 'libdirectory' in $conffile" - exit 1 -fi -if [ ! -d "$libdir" ]; then - echo "Script directory $libdir not found." - exit 1 +if [ -z "$libdir" ]; then + if [ -d "@libdir@" ]; then + libdir="@libdir@" + else + echo "Could not find entry 'libdirectory' in $conffile." + exit 1 + fi +else + if [ ! -d "$libdir" ]; then + echo "Lib directory $libdir not found." + exit 1 + fi fi + configdirectory=`grep configdirectory $conffile | awk '{print $3}'` if [ ! -n "$configdirectory" ]; then echo "Cound not find entry 'configdirectory' in $conffile"