Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ notifications:
node_js:
- "10.2.1"

before_install: npm install -g npm

install: npm install

script: ./bin/npm test

git:
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ module.exports = (grunt) ->
grunt.registerTask('lint', ['coffeelint'])
grunt.registerTask('default', ['coffee', 'lint'])
grunt.registerTask('test', ['clean', 'default', 'shell:test'])
grunt.registerTask('prepublish', ['clean', 'coffee', 'lint'])
grunt.registerTask('prepare', ['clean', 'coffee', 'lint'])
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
install:
- ps: Install-Product node $env:nodejs_version $env:platform
- npm install -g npm
- npm install
- npm ci

build: off

Expand Down
12 changes: 0 additions & 12 deletions bin/apm
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@ binDir=`pwd -P`
# Force npm to use its builtin node-gyp
unset npm_config_node_gyp

export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"

# Assumption: env iterates through environment variables in the same order that
# process.env iterates through properties within npm. So, we take the last match.
for var in $(env | grep -i ^npm_config_python=)
do
ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
unset ${var%%=*}
done

export npm_config_python="${binDir}/python-interceptor.sh"

cliPath="$binDir/../lib/cli.js"
if [[ $(uname -r) == *-Microsoft ]]; then
cliPath="$(echo $cliPath | sed 's/\/mnt\/\([a-z]*\)\(.*\)/\1:\2/')"
Expand Down
15 changes: 0 additions & 15 deletions bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,4 @@ export PATH="$SCRIPT_DIR:$PATH"
# Force npm to use its builtin node-gyp
unset npm_config_node_gyp

export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"

# Assumption: env iterates through environment variables in the same order that
# process.env iterates through properties within npm. So, we take the last match.
for var in $(env | grep -i ^npm_config_python=)
do
ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
done
if [ -z "${ATOM_APM_ORIGINAL_PYTHON}" ] && [ -n "${PYTHON:-}" ]
then
ATOM_APM_ORIGINAL_PYTHON="${PYTHON}"
fi

export npm_config_python="${SCRIPT_DIR}/python-interceptor.sh"

"$SCRIPT_DIR"/../node_modules/.bin/npm $@
42 changes: 0 additions & 42 deletions bin/python-interceptor.sh

This file was deleted.

Loading