Skip to content

scripts: do not check llnode.sh into git #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joyeecheung merged 1 commit into from
Mar 13, 2018
Merged

scripts: do not check llnode.sh into git #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
scripts: do not check llnode.sh into git 
Otherwise running `npm link` would always result in unstaged
changes. npm should be able to link the script after installation
is complete and the script has been generated in the module
directory.

Also requires the path module in the generated script so it works
in v4.x.
  • Loading branch information
@joyeecheung
joyeecheung committed Mar 13, 2018
commit 567e2f5b177588c26dd3bd84c8fd72a9f7dde69d
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ out/
npm-debug.log
node_modules/
options.gypi
llnode.sh
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "test"
},
"bin": {
"llnode": "scripts/llnode.sh"
"llnode": "llnode.sh"
},
"//": "(Blame C++)",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ fs.mkdirSync('tools');
console.log(`Linking tools/gyp to ${gypDir}/gyp`);
fs.symlinkSync(`${gypDir}/gyp`, 'tools/gyp');

fs.writeFileSync(`${buildDir}/scripts/llnode.sh`, scriptText(lldbExe));
fs.writeFileSync(`${buildDir}/llnode.sh`, scriptText(lldbExe));

// Exit with success.
process.exit(0);
Expand Down Expand Up @@ -320,7 +320,7 @@ function scriptText(lldbExe) {

return `#!/bin/sh

LLNODE_SCRIPT=\`node -p "path.resolve('$0')"\`
LLNODE_SCRIPT=\`node -p "require('path').resolve('$0')"\`

SCRIPT_PATH=\`dirname $LLNODE_SCRIPT\`
if [ \`basename $SCRIPT_PATH\` = ".bin" ]; then
Expand Down
5 changes: 0 additions & 5 deletions scripts/llnode.sh
View file
Open in desktop

This file was deleted.