diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-09 16:09:24 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-09 16:09:24 +0000 |
| commit | 488a906c151251df637eeee38fc820ef905f0ffc (patch) | |
| tree | 642caa3d3406c562254b3a996ba7a681ee649df5 /trunk | |
| parent | 87babaf85a109126a86ef1de539ebd3525d8b28d (diff) | |
| download | simplepkg-488a906c151251df637eeee38fc820ef905f0ffc.tar.gz simplepkg-488a906c151251df637eeee38fc820ef905f0ffc.tar.bz2 | |
simplaret: small fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@327 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rwxr-xr-x | trunk/src/simplaret | 9 | ||||
| -rw-r--r-- | trunk/templates/vserver/vserver.perms | 37 |
2 files changed, 43 insertions, 3 deletions
diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 719063c..20ef8ea 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -423,8 +423,8 @@ function simplaret_purge { if [ -z "$SILENT" ]; then echo "$BASENAME: purging all packages $mtime_message for:" - echo -e "\t- arch $ARCH and version $VERSION $and_patches" - echo -e "\t- noarch folder" + echo -e "\t- Arch $ARCH and version $VERSION $and_patches" + echo -e "\t- Noarch folder" fi for repos_type in $which; do @@ -508,7 +508,7 @@ function simplaret_get { # then search for the package in the repositories search="`simplaret_search $1 --formatted`" - search_results="`echo $search | bc -l`" + search_results="`echo "$search" | wc -l`" for result in $search; do @@ -568,6 +568,9 @@ function simplaret_get { if [ "$SIMPLARET_DOWNLOAD_FROM_NEXT_REPO" != "1" ]; then return 1 else + if [ "$2" != "--silent" ]; then + echo Trying to fetch $candidate from the next repository... + fi if (($search_results <= 0)); then return 1 fi diff --git a/trunk/templates/vserver/vserver.perms b/trunk/templates/vserver/vserver.perms index e69de29..0c136ed 100644 --- a/trunk/templates/vserver/vserver.perms +++ b/trunk/templates/vserver/vserver.perms @@ -0,0 +1,37 @@ +./etc;0;0;755 +./etc/apache;0;0;755 +./etc/apache/httpd.conf;0;0;644 +./etc/apache/php.ini;0;0;644 +./etc/apache/vhosts;0;0;644 +./etc/logrotate.d;0;0;755 +./etc/logrotate.d/apache;0;0;644 +./etc/rc.d;0;0;755 +./etc/rc.d/rc.httpd;0;0;644 +./etc/rc.d/rc;0;0;755 +./etc/rc.d/rc.0;0;0;755 +./etc/rc.d/rc.4;0;0;644 +./etc/rc.d/rc.6;0;0;755 +./etc/rc.d/rc.K;0;0;755 +./etc/rc.d/rc.M;0;0;755 +./etc/rc.d/rc.S;0;0;755 +./etc/rc.d/rc.ip_forward;0;0;644 +./etc/rc.d/rc.inet2;0;0;755 +./etc/rc.d/rc.inetd;0;0;644 +./etc/rc.d/rc.mysqld;0;0;644 +./etc/rc.d/rc.local;0;0;755 +./etc/rc.d/rc.postfix;0;0;644 +./etc/rc.d/rc.sendmail;0;0;644 +./etc/rc.d/rc.serial;0;0;755 +./etc/rc.d/rc.sshd;0;0;755 +./etc/rc.d/rc.syslog;0;0;755 +./etc/rc.d/rc.sysvinit;0;0;755 +./etc/ssh;0;0;755 +./etc/ssh/sshd_config;0;0;644 +./etc/rssh.conf;0;0;644 +./etc/hosts;0;0;644 +./etc/profile;0;0;644 +./var;0;0;755 +./var/www;0;0;755 +./var/www/htdocs;0;0;755 +./var/www/htdocs/missing.html;0;0;644 +./var/www/missing.html;0;0;644 |