diff options
| -rw-r--r-- | trunk/conf/simplepkg.conf.new | 10 | ||||
| -rw-r--r-- | trunk/lib/common.sh | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new index 70aa70b..42b0168 100644 --- a/trunk/conf/simplepkg.conf.new +++ b/trunk/conf/simplepkg.conf.new @@ -44,10 +44,10 @@ SIMPLARET_DELETE_DURING="0" SIMPLARET_PURGE_WEEKS="3" # Where patches are placed -PATCHES_DIR="/var/simplaret/patches" +PATCHES_DIR="/var/simplepkg/patches" # Place to store your packages -STORAGE="/var/simplaret/packages" +STORAGE="/var/simplepkg/packages" # Whether to use passive ftp transfers; # to enable it, set to "1" or "yes" @@ -127,13 +127,13 @@ TEMPLATE_STORAGE_STYLE="own-folder" # MKBUILD AND CREATEPKG SECTION #--------------------------------------------------------------------- # Set SlackBuilds default directory from scripts -SLACKBUILDS_DIR="/var/simplaret/slackbuilds" +SLACKBUILDS_DIR="/var/simplepkg/slackbuilds" # Set binaries default repository directory -MAKEPKG_REPOS="/var/simplaret/repos" +MAKEPKG_REPOS="/var/simplepkg/repos" # Set sources default directory -SOURCE_DIR="/var/simplaret/sources" +SOURCE_DIR="/var/simplepkg/sources" # Set color style # possible values are: color,gray, none diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 6ebd38a..f83e761 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -585,8 +585,7 @@ function set_jail_perms { function svn_add_meta { - find *meta -exec svn add {} 2> /dev/null \; - find . -name *meta -exec svn add {} 2> /dev/null \; + find . -name '*meta' -exec svn add {} 2> /dev/null \; } @@ -594,7 +593,7 @@ function gen_filelist { # generate FILELIST.TXT # usage: gen_filelist - find . -type f -name *.tgz -follow -print | sort | tr '\n' '\0' | \ + find . -type f -name '*.tgz' -follow -print | sort | tr '\n' '\0' | \ xargs -0r ls -ldL --time-style=long-iso > FILELIST.TXT echo "Created new FILELIST.TXT" @@ -609,7 +608,8 @@ function gen_patches_filelist { cwd="`pwd`" cd $1 - for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST + find . -type f -name '*.tgz' -follow -print | sort | tr '\n' '\0' | \ + xargs -0r ls -ldL --time-style=long-iso > FILE_LIST cd $cwd if [ "$1" == "." ]; then |