attempting to fix #66

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

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 2425ca8593e6eec14a5d1ddb7d479f7704670d5d..d583a92c19f5aa9a11124e9ad2602ef8c662dad4 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -141,11 +141,11 @@ function eval_parameter {
   # return the evaluated parameter if available or $2 $3 ... $n
 
   if [ -e "$HOME_CONF" ] && grep -qe "^$1=" $HOME_CONF; then
-    grep -e "^$1=" $HOME_CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
+    grep -e "^$1=" $HOME_CONF | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
   elif [ -e "$CONF" ] && grep -qe "^$1=" $CONF; then
-    grep -e "^$1=" $CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
+    grep -e "^$1=" $CONF | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
   elif [ -e "$DEFAULT_CONF" ] && grep -qe "^$1=" $DEFAULT_CONF; then
-    grep -e "^$1=" $DEFAULT_CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
+    grep -e "^$1=" $DEFAULT_CONF | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | sed -e 's/ *#.*$//'
   else
     shift
     echo $*

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 61ae7a4b0ce65d2081ec1ba1c7060ec431cccdd8..40682426855df7ef281c886a9cd456323a4706fc 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -196,7 +196,7 @@ function simplaret_repository {
     definition="$definition-$ARCH"
   fi
 
-  grep -e "^$definition=" $REPOS_CONF | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | cut -d "#" -f 1
+  grep -e "^$definition=" $REPOS_CONF | tail -n 1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | cut -d "#" -f 1
 
 }