diff options
Diffstat (limited to 'trunk/src/simplaret')
| -rwxr-xr-x | trunk/src/simplaret | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 66bb1e1..d6555a0 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -17,7 +17,6 @@ # BASENAME="`basename $0`" -REPOS_CONF="/etc/simplepkg/repos.conf" COMMON="/usr/libexec/simplepkg/common.sh" if [ -f "$COMMON" ]; then @@ -27,6 +26,12 @@ else exit 1 fi +if [ -f "/etc/simplepkg/repos.conf" ]; then + REPOS_CONF="/etc/simplepkg/repos.conf" +else + REPOS_CONF="/etc/simplepkg/default/repos.conf" +fi + function simplaret_usage { echo "usage: [ARCH=otherarch] [VERSION=otherversion] $BASENAME [OPTION] package-name" @@ -713,11 +718,11 @@ function simplaret_search_and_process_patch { # check if the patch was already downloaded if echo "$DOWNLOADED_PATCHES" | grep -q " $ARCH:$VERSION:$sugested_pack "; then - if [ "$IS_UPGRADE" != "1" ]; then - echo Package $sugested_pack already downloaded - # echo "Jail $root needs package $sugested_pack (already downloaded, skipping)" + #if [ "$IS_UPGRADE" != "1" ]; then + #echo Package $sugested_pack already downloaded + #echo "Jail $root needs package $sugested_pack (already downloaded, skipping)" return - fi + #fi fi pack="`echo $sugested_pack | sed -e 's/\+/\\\+/'`" |