diff options
Diffstat (limited to 'branches/0.6/lib/common.sh')
| -rw-r--r-- | branches/0.6/lib/common.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/branches/0.6/lib/common.sh b/branches/0.6/lib/common.sh index 5c53a09..c501722 100644 --- a/branches/0.6/lib/common.sh +++ b/branches/0.6/lib/common.sh @@ -5,7 +5,7 @@ # # Uses some functions from pkgtools, which license is: # -# Copyright 1999 Patrick Volkerding, Moorhead, Minnesota, USA +# Copyright 1999 Patrick Volkerding, Moorhead, Minnesota, USA # Copyright 2001, 2002, 2003 Slackware Linux, Inc., Concord, California, USA # All rights reserved. # @@ -257,6 +257,14 @@ function eval_config { # now we place "patches" on the top of ROOT_PRIORITY ROOT_PRIORITY="patches `echo $ROOT_PRIORITY | sed -e 's/patches//'`" + # ---------------------------------------------------------------- + # createpkg and mkbuild section + SLACKBUILD_DIR="`eval_parameter SLACKBUILD_DIR /var/slackbuilds`" + MAKEPKG_REPOS="`eval_parameter MAKEPKG_REPOS /var/simplaret/binaries`" + REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE 1`" + MOVE_BIN_PACKAGE="`eval_boolean_parameter MOVE_BIN_PACKAGE 1`" + # ---------------------------------------------------------------- + else echo $1 error: config file $CONFIG not found exit 1 @@ -271,7 +279,7 @@ function eval_config { fi if [ -z "$ARCH" ]; then - ARCH="$DEFAULT_ARCH" + ARCH="$DEFAULT_ARCH" fi if [ -z "$VERSION" ]; then @@ -527,7 +535,7 @@ function copy_template_files { # usage: copy_template_files <jail-path> if [ -d "$1" ]; then - if [ -d "$TEMPLATE_BASE.d" ]; then + if [ -d "$TEMPLATE_BASE.d" ]; then echo "Copying template files to $1..." if use_svn && [ -d "$TEMPLATE_BASE.d/.svn" ]; then rsync -av --exclude=.svn $TEMPLATE_BASE.d/ $1/ |