Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/guysoft/OctoPi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Sheffer <guysoft@gmail.com>2015-03-04 03:34:53 +0300
committerGuy Sheffer <guysoft@gmail.com>2015-03-04 03:34:53 +0300
commit864d06f527058c0b3d0f5e4f2dda0bf794e00829 (patch)
treebe01c08701f858a45146d7a3175c95ab43bf7169
parentb636a6be08d74adedf2dc14a23ab35bed885cdda (diff)
Make config export variables, regression caused by #73
-rwxr-xr-xsrc/config14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/config b/src/config
index df89379..ce8f88a 100755
--- a/src/config
+++ b/src/config
@@ -6,15 +6,15 @@ if [ -f $CONFIG_DIR/config.local ]; then
source $CONFIG_DIR/config.local
fi
-[ -n "$SCRIPT_PATH" ] || SCRIPT_PATH=$CONFIG_DIR
-[ -n "$IMAGE_PATH" ] || IMAGE_PATH=$SCRIPT_PATH/image
+[ -n "$SCRIPT_PATH" ] || export SCRIPT_PATH=$CONFIG_DIR
+[ -n "$IMAGE_PATH" ] || export IMAGE_PATH=$SCRIPT_PATH/image
-[ -n "$ZIP_IMG" ] || ZIP_IMG=`ls -t $IMAGE_PATH/*-raspbian*.zip | head -n 1`
+[ -n "$ZIP_IMG" ] || export ZIP_IMG=`ls -t $IMAGE_PATH/*-raspbian*.zip | head -n 1`
-[ -n "$OCTOPI_WORKSPACE" ] || OCTOPI_WORKSPACE=$SCRIPT_PATH/workspace
-[ -n "$CHROOT_SCRIPT_PATH" ] || CHROOT_SCRIPT_PATH=$SCRIPT_PATH/chroot_script
-[ -n "$MOUNT_PATH" ] || MOUNT_PATH=$OCTOPI_WORKSPACE/mount
-[ -n "$OVERRIDE_HOSTNAME" ] || OVERRIDE_HOSTNAME=octopi
+[ -n "$OCTOPI_WORKSPACE" ] || export OCTOPI_WORKSPACE=$SCRIPT_PATH/workspace
+[ -n "$CHROOT_SCRIPT_PATH" ] || export CHROOT_SCRIPT_PATH=$SCRIPT_PATH/chroot_script
+[ -n "$MOUNT_PATH" ] || export MOUNT_PATH=$OCTOPI_WORKSPACE/mount
+[ -n "$OVERRIDE_HOSTNAME" ] || export OVERRIDE_HOSTNAME=octopi
echo "================================================================"
echo "Using the following config:"