From 7ee3ccb43d7f965b35913c72c7566335ddeaeefa Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 16 Dec 2014 09:33:16 -0800 Subject: [PATCH] Move up one more directory --- resources/win/apm.sh | 2 +- resources/win/atom.sh | 4 ++-- src/browser/squirrel-update.coffee | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/win/apm.sh b/resources/win/apm.sh index 9537f8a32..3a317ca9d 100644 --- a/resources/win/apm.sh +++ b/resources/win/apm.sh @@ -1,3 +1,3 @@ #!/bin/sh -"$0/../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../app/apm/node_modules/atom-package-manager/lib/cli.js" "$@" +"$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../../app/apm/node_modules/atom-package-manager/lib/cli.js" "$@" diff --git a/resources/win/atom.sh b/resources/win/atom.sh index 79aee604a..b8ddb986d 100644 --- a/resources/win/atom.sh +++ b/resources/win/atom.sh @@ -16,7 +16,7 @@ while getopts ":fhtvw-:" opt; do done if [ $EXPECT_OUTPUT ]; then - "$0/../../atom.exe" "$@" + "$0/../../../atom.exe" "$@" else - "$0/../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/atom.js" "$@" + "$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/atom.js" "$@" fi diff --git a/src/browser/squirrel-update.coffee b/src/browser/squirrel-update.coffee index f41975147..464e515e6 100644 --- a/src/browser/squirrel-update.coffee +++ b/src/browser/squirrel-update.coffee @@ -117,7 +117,7 @@ addCommandsToPath = (callback) -> atomShCommandPath = path.join(binFolder, 'atom') relativeAtomShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'atom.sh')) - atomShCommand = "#!/bin/sh\r\n\"$0/#{relativeAtomShPath.replace(/\\/g, '/')}\" \"$@\"" + atomShCommand = "#!/bin/sh\r\n\"$0/../#{relativeAtomShPath.replace(/\\/g, '/')}\" \"$@\"" apmCommandPath = path.join(binFolder, 'apm.cmd') relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'app', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm.cmd')) @@ -125,7 +125,7 @@ addCommandsToPath = (callback) -> apmShCommandPath = path.join(binFolder, 'apm') relativeApmShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'apm.sh')) - apmShCommand = "#!/bin/sh\r\n\"$0/#{relativeApmShPath.replace(/\\/g, '/')}\" \"$@\"" + apmShCommand = "#!/bin/sh\r\n\"$0/../#{relativeApmShPath.replace(/\\/g, '/')}\" \"$@\"" fs.writeFile atomCommandPath, atomCommand, -> fs.writeFile atomShCommandPath, atomShCommand, ->