From 2e8f7c457257d3741622a18e9d74b694901bee69 Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 15 Jan 2007 15:28:58 +0000 Subject: simplepkg: about to do a new release? git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@105 04377dda-e619-0410-9926-eae83683ac58 --- simplepkg.SlackBuild | 2 +- src/simplaret | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild index fb790d6..8c41aac 100755 --- a/simplepkg.SlackBuild +++ b/simplepkg.SlackBuild @@ -6,7 +6,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.4.9" +VERSION="0.4.9pre7" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" diff --git a/src/simplaret b/src/simplaret index 1c0938b..c47e093 100755 --- a/src/simplaret +++ b/src/simplaret @@ -60,6 +60,10 @@ function simplaret_eval_config { # now we place "patches" on the top of ROOT_PRIORITY ROOT_PRIORITY="patches `echo $ROOT_PRIORITY | sed -e 's/patches//'`" + # force case insensitiveness + CONSIDER_ALL_PACKAGES_AS_PATCHES="`echo $CONSIDER_ALL_PACKAGES_AS_PATCHES | tr '[:upper:]' '[:lower:]'`" + DOWNLOAD_EVEN_APPLIED_PATCHES="`echo $DOWNLOAD_EVEN_APPLIED_PATCHES | tr '[:upper:]' '[:lower:]'`" + } function simplaret_get_index { @@ -525,7 +529,7 @@ function simplaret_search_and_download_patch { if [ "$package_installed" == "1" ]; then if [ "$repos_type" == "patches" ]; then - if [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "1" ]; then + if [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "1" ] || [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "yes" ]; then get="yes" elif [ "$package_version" != "$installed_version" ] || [ "$package_build" != "$installed_build" ]; then get="yes" @@ -533,7 +537,7 @@ function simplaret_search_and_download_patch { elif [ "$repos_type" == "root" ] && [ "$is_patch" == "yes" ]; then - if [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "1" ]; then + if [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "1" ] || [ "$DOWNLOAD_EVEN_APPLIED_PATCHES" == "yes" ]; then get="yes" elif [ "$package_version" != "$installed_version" ] || [ "$package_build" != "$installed_build" ]; then get="yes" @@ -603,7 +607,7 @@ function simplaret_get_jail_patches { done # grab patches from every other places - if [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "1" ]; then + if [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "1" ] || [ "$CONSIDER_ALL_PACKAGES_AS_PATCHES" == "yes" ]; then # old behaviour was just one loop: # for sugested in `simplaret_search --formatted | grep -v patches`; do -- cgit v1.2.3