[Lunar-commits] <lunar-iso> eval not required for lsh anymore.

[Peter de Ridder]

commit 53b4b69fe1aaa1973cee3918d611d8cb20e88925
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Thu, 11 Apr 2013 11:04:04 -0700
URL: https://github.com/lunar-linux/lunar-iso/commit/53b4b69fe1aaa1973cee3918d611d8cb20e88925

eval not required for lsh anymore.
---
  mkfiles/download.mk           | +1/-1     
  scripts/bootstrap-lunar-cache | +1/-1     
  scripts/download-lunar-spool  | +3/-3     
  3 files changed, 5 insertions(+), 5 deletions(-)

--- a/mkfiles/download.mk
+++ b/mkfiles/download.mk
@@ -9,7 +9,7 @@ download: download-lunar
 $(ISO_SOURCE)/spool/moonbase.tar.bz2:
 	@echo download-moonbase
 	@mkdir -p $(ISO_SOURCE)/spool
-	@wget -O $@.tmp "`lsh eval echo '$$MOONBASE_URL'`/moonbase.tar.bz2"
+	@wget -O $@.tmp "`lsh echo '$$MOONBASE_URL'`/moonbase.tar.bz2"
 	@mv $@.tmp $@
 
 
--- a/scripts/bootstrap-lunar-cache
+++ b/scripts/bootstrap-lunar-cache
@@ -5,7 +5,7 @@ BOOTSTRAP_MODULES="bash binutils bzip2 coreutils dialog diffutils file findutils
 mkdir -p "$ISO_SOURCE/cache"
 
 NEED_MODULES=
-LUNAR_CACHE=`lsh eval echo '$INSTALL_CACHE'`
+LUNAR_CACHE=`lsh echo '$INSTALL_CACHE'`
 NEED_CACHE=
 NO_CACHE=
 
--- a/scripts/download-lunar-spool
+++ b/scripts/download-lunar-spool
@@ -4,7 +4,7 @@ CORE_MODULES=`find "$ISO_TARGET/var/lib/lunar/moonbase/core" -name DETAILS -prin
 
 mkdir -p "$ISO_SOURCE/spool"
 
-LUNAR_CACHE=`lsh eval echo '$SOURCE_CACHE'`
+LUNAR_CACHE=`lsh echo '$SOURCE_CACHE'`
 NO_CACHE=
 
 echo Required modules:
@@ -13,9 +13,9 @@ for mod in $CORE_MODULES ; do
 done
 
 for mod in $CORE_MODULES ; do
-  lsh eval MOONBASE="$ISO_TARGET/var/lib/lunar/moonbase" download_module "$mod"
+  lsh MOONBASE="$ISO_TARGET/var/lib/lunar/moonbase" download_module "$mod"
   # check for cache file presence
-  for src in `lsh eval MOONBASE="$ISO_TARGET/var/lib/lunar/moonbase" sources "$mod"` ; do
+  for src in `lsh MOONBASE="$ISO_TARGET/var/lib/lunar/moonbase" sources "$mod"` ; do
     if [ ! -f "$ISO_SOURCE/spool/$src" ] ; then
       cp "$LUNAR_CACHE/$src" "$ISO_SOURCE/spool/$src" || NO_CACHE="$NO_CACHE $mod"
     fi