summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-02-15 01:21:16 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-02-15 01:21:16 +0100
commit84abaf01394412521ef087756704936f459f4af0 (patch)
tree6244a81681d34ebbbd043fb7cb803e0b981a2b8c
parentc49126d72b7c4032af66ae7fb3810e22b130946d (diff)
some more changes related to FHS stuff
-rw-r--r--README1
-rwxr-xr-xsrc/aif.sh12
2 files changed, 6 insertions, 7 deletions
diff --git a/README b/README
index 3e249e6..6cd4f84 100644
--- a/README
+++ b/README
@@ -64,7 +64,6 @@ The goal of AIF is not (yet):
** File locations (on the install CD): **
-Basically aif.sh is put in /arch (together with the default installer scripts), while all other aif-related files belong in /home/arch/aif
* aif.sh -> /sbin/aif
* docs -> /usr/share/aif/docs
diff --git a/src/aif.sh b/src/aif.sh
index 783e7c9..cf52ac9 100755
--- a/src/aif.sh
+++ b/src/aif.sh
@@ -71,8 +71,8 @@ load_module ()
{
[ -z "$1" ] && die_error "load_module needs a module argument"
log "Loading module $1 ..."
- path=/home/arch/aif/user/"$1"
- [ "$1" = core ] && path=/home/arch/aif/core
+ path=$LIB_USER/"$1"
+ [ "$1" = core ] && path=$LIB_CORE
for submodule in lib #procedure don't load procedures automatically!
do
@@ -105,8 +105,8 @@ load_procedure()
wget "$2" -q -O $procedure >/dev/null || die_error "Could not download procedure $2"
else
log "Loading procedure $1/procedures/$2 ..."
- procedure=/home/arch/aif/user/"$1"/procedures/"$2"
- [ "$1" = core ] && procedure=/home/arch/aif/core/procedures/"$2"
+ procedure=$LIB_USER/"$1"/procedures/"$2"
+ [ "$1" = core ] && procedure=$LIB_CORE/procedures/"$2"
fi
[ -f "$procedure" ] && source "$procedure" || die_error "Something went wrong while sourcing procedure $procedure"
}
@@ -119,8 +119,8 @@ load_lib ()
[ -z "$1" ] && die_error "load_library needs a module als \$1 and library as \$2"
[ -z "$2" ] && die_error "load_library needs a library as \$2"
log "Loading library $1/libs/$2 ..."
- lib=/home/arch/aif/user/"$1"/libs/"$2"
- [ "$1" = core ] && lib=/home/arch/aif/core/libs/"$2"
+ lib=$LIB_USER/"$1"/libs/"$2"
+ [ "$1" = core ] && lib=$LIB_CORE/libs/"$2"
source $lib || die_error "Something went wrong while sourcing library $lib"
}