[Lunar-commits] r18575 - lunar/trunk/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-02-07 23:03:51 +0000 (Tue, 07 Feb 2006)
New Revision: 18575

Modified:
   lunar/trunk/var/lib/lunar/functions/aliases.lunar
Log:
Bugfix - tried to exec $() wrongly.


Modified: lunar/trunk/var/lib/lunar/functions/aliases.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/aliases.lunar	2006-02-07 22:39:59 UTC (rev 18574)
+++ lunar/trunk/var/lib/lunar/functions/aliases.lunar	2006-02-07 23:03:51 UTC (rev 18575)
@@ -16,10 +16,10 @@
   # try to figure out where the aliases file is:
   if [ -z "$ALIASES" -o ! -f "$ALIASES" ]; then
     if [ -f "$MOONBASE/aliases" ] ; then
-	  ALIASES="$MOONBASE/aliases"
-	else
-	  ALIASES="/var/lib/lunar/aliases"
-	fi
+      ALIASES="$MOONBASE/aliases"
+    else
+      ALIASES="/var/lib/lunar/aliases"
+    fi
   fi
   if [ "${1:0:1}" == "%" ] ; then
     debug_msg "unalias($@)"
@@ -29,7 +29,7 @@
       if $(module_installed $TARGET) ; then
         debug_msg "unaliased \"$1\"->\"$TARGET\""
         echo $TARGET
-	return
+        return
       fi
     done
     # shortcut out: in the satisfy_depends stage we should NOT ask this again
@@ -78,14 +78,14 @@
       ((N=0))
       for TARGET in $TARGETS ; do
         ((N++))
-	TARGETBYNUM[$N]=$TARGET
+        TARGETBYNUM[$N]=$TARGET
         error_message "  ${QUERY_COLOR}$N${MESSAGE_COLOR} - ${DEFAULT_COLOR}${MODULE_COLOR}$TARGET${DEFAULT_COLOR}"
       done
       read CHOICE
       # test directly first
-      if $(echo $TARGETS | grep -qw "$CHOICE") ; then
+      if echo $TARGETS | grep -qw "$CHOICE" ; then
         echo $TARGET
-	return
+        return
       # then the number
       elif [ -n "$CHOICE" -a -n "${TARGETBYNUM[$CHOICE]}" ] ; then
         echo ${TARGETBYNUM[$CHOICE]}