From e393de2aa9eeb6129f15c58dd89c45133dddc0fb Mon Sep 17 00:00:00 2001 From: Drew Fisher Date: Mon, 1 Aug 2016 16:01:19 -0700 Subject: [PATCH] Remove PYTHONPATH override that worked around a Meteor bug Meteor has long since fixed their node-gyp path bug, and the code in the Makefile can't possibly be right because $HOME/.meteor/tools doesn't exist anymore. --- Makefile | 2 +- shell/run-dev.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2ce508da..9311f1cd 100644 --- a/Makefile +++ b/Makefile @@ -334,7 +334,7 @@ shell/public/%-m.svg: icons/%.svg shell-build: shell/imports/* shell/imports/*/* shell/client/* shell/server/* shell/shared/* shell/public/* shell/packages/* shell/packages/*/* shell/.meteor/packages shell/.meteor/release shell/.meteor/versions tmp/.shell-env @$(call color,meteor frontend) @test -z "$$(find -L shell/* -type l)" || (echo "error: broken symlinks in shell: $$(find -L shell/* -type l)" >&2 && exit 1) - @OLD=`pwd` && cd shell && PYTHONPATH=$$HOME/.meteor/tools/latest/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib meteor build --directory "$$OLD/shell-build" + @OLD=`pwd` && cd shell && meteor build --directory "$$OLD/shell-build" # ==================================================================== # Bundle diff --git a/shell/run-dev.sh b/shell/run-dev.sh index f5a3c6fe..5acd5287 100755 --- a/shell/run-dev.sh +++ b/shell/run-dev.sh @@ -94,8 +94,4 @@ cat > $SETTINGS << __EOF__ } __EOF__ -# Work-around for problem where Meteor's bundled npm prefers the system gyp -# over its own bundled version, and the system gyp doesn't work. -export PYTHONPATH=$("$SCRIPT_DIR/../find-meteor-dev-bundle.sh")/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib - exec meteor run --port=$BIND_IP:$PORT --settings $SETTINGS