diff options
| -rw-r--r-- | trunk/conf/simplepkg.conf.new | 4 | ||||
| -rw-r--r-- | trunk/doc/CHANGELOG | 10 | ||||
| -rw-r--r-- | trunk/lib/common.sh | 1 | ||||
| -rwxr-xr-x | trunk/simplepkg.SlackBuild | 2 | ||||
| -rwxr-xr-x | trunk/src/mkjail | 8 | ||||
| -rwxr-xr-x | trunk/src/repos | 7 |
6 files changed, 27 insertions, 5 deletions
diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new index 28af9a7..a6ed9a4 100644 --- a/trunk/conf/simplepkg.conf.new +++ b/trunk/conf/simplepkg.conf.new @@ -13,6 +13,10 @@ # where jails are placed JAIL_ROOT="/vservers" +# wheter mkjial should add new jails in the jail list +# to enable it, set to "1" or "yes" +ADD_TO_JAIL_LIST="1" + # whether mkjail should clean the package cache before installation # to enable it, set to "1" or "yes" SIMPLARET_CLEAN="1" diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 6a8fcc0..b212ca4 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -1,6 +1,16 @@ simplepkg changelog =================== +0.5pre6 +======= + + - repos: + - FILE_LIST generation fix + + - mkjail: + - new config variable ADD_TO_JAIL_LIST controls wheter to + add new jails into the JAIL_LIST file + 0.5pre5 ======= diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index e5f6aed..1eff334 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -211,6 +211,7 @@ function eval_config { SIGNATURE_CHECKING="`eval_boolean_parameter SIGNATURE_CHECKING 0`" DEPENDENCY_CHECKING="`eval_boolean_parameter DEPENDENCY_CHECKING 1`" TEMPLATES_UNDER_SVN="`eval_boolean_parameter TEMPLATES_UNDER_SVN 0`" + ADD_TO_JAIL_LIST="`eval_boolean_parameter ADD_TO_JAIL_LIST 1`" # Enabling this option (i.e, setting to "1" or "yes"), simplaret will # donwload even # already applied patches, a good option when you plan diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild index e0ccd54..10d727d 100755 --- a/trunk/simplepkg.SlackBuild +++ b/trunk/simplepkg.SlackBuild @@ -6,7 +6,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.5pre5" +VERSION="0.5pre6" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" diff --git a/trunk/src/mkjail b/trunk/src/mkjail index 43669e1..f6c935c 100755 --- a/trunk/src/mkjail +++ b/trunk/src/mkjail @@ -61,9 +61,11 @@ function jailist_update { # update the jail list file # usage: jailist_update <jail-path> - touch $JAIL_LIST - if ! grep -q -e "^$1\$" $JAIL_LIST; then - echo $1 >> $JAIL_LIST + if [ "$ADD_TO_JAIL_LIST" == "1" ]; then + touch $JAIL_LIST + if ! grep -q -e "^$1\$" $JAIL_LIST; then + echo $1 >> $JAIL_LIST + fi fi } diff --git a/trunk/src/repos b/trunk/src/repos index 95a3936..c37e625 100755 --- a/trunk/src/repos +++ b/trunk/src/repos @@ -30,11 +30,16 @@ function svn_add_meta { function gen_filelist { + local cwd + for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILELIST.TXT echo "Created new FILELIST.TXT" if [ -d "patches" ]; then - for file in `find patches | grep -e ".tgz$"`; do ls -l $file; done > patches/FILE_LIST + cwd="`pwd`" + cd patches + for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST echo "Created new patches/FILE_LIST" + cd $pwd fi } |