From 3a8af0ce38bafddf0c8aaeaf8c2dc7d0fb68fd95 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 29 Jul 2014 10:05:10 +0200 Subject: [PATCH] scripts: fix GLUON_SITE_CONFIG check_site.sh and site.sh were setting GLUON_SITE_CONFIG on their own even though the environment variable was already exported. --- scripts/check_site.sh | 2 -- scripts/site.sh | 3 --- 2 files changed, 5 deletions(-) diff --git a/scripts/check_site.sh b/scripts/check_site.sh index 2f2db553..17ee4b56 100755 --- a/scripts/check_site.sh +++ b/scripts/check_site.sh @@ -1,7 +1,5 @@ #!/bin/sh -export GLUON_SITE_CONFIG="$GLUONDIR/site/site.conf" - SITE_CONFIG_LUA=packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua CHECK_SITE_LIB=scripts/check_site_lib.lua diff --git a/scripts/site.sh b/scripts/site.sh index 597a2857..c523da20 100755 --- a/scripts/site.sh +++ b/scripts/site.sh @@ -1,8 +1,5 @@ #!/bin/sh -export GLUONDIR="$(dirname "$0")/.." -export GLUON_SITE_CONFIG="$GLUONDIR/site/site.conf" - SITE_CONFIG_LUA=packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua "$GLUONDIR"/openwrt/staging_dir/host/bin/lua -e "print(assert(dofile(os.getenv('GLUONDIR') .. '/${SITE_CONFIG_LUA}').$1))" 2>/dev/null