small fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@405 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/conf/simplepkg.conf.new b/trunk/conf/simplepkg.conf.new
index 70aa70bd81aa548e8de04b6969520876d7fcd929..42b01680a72ebf7fddc10a2c2ac1a0f0c9f86608 100644 (file)
--- 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 6ebd38a23a76d158e7471f217127b8a5acec2b49..f83e761995489e03fccefe53998e5baa0e8a47c6 100644 (file)
--- 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