Skip to content
This repository has been archived by the owner on Oct 21, 2022. It is now read-only.

Commit

Permalink
Realised there were other references to atom-shell to update
Browse files Browse the repository at this point in the history
It seems though that the download-electron grunt task seems to create an
Atom.app package. Was expecting it to be Electron.app and raised an issue
for them here electron-archive/grunt-download-electron#30

NOTE: I haven't tested this on Linux or Windows
  • Loading branch information
martinchooooooo committed Apr 23, 2015
1 parent 3e270f7 commit 682b1da
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
13 changes: 8 additions & 5 deletions script/build-app.sh
@@ -1,19 +1,22 @@
#!/usr/bin/env bash
set -e

# Create LightTable release using our local Atom Shell installation
# Create LightTable release using our local Electron installation
# (Mac, Linux, or Cygwin)

# Ensure we start in project root
cd "$(dirname "${BASH_SOURCE[0]}")"; cd ..

#----------------------------------------------------------------------
# Get OS-specific Atom details
# Get OS-specific Electron details
#----------------------------------------------------------------------

ATOM_DIR="shell/atom-shell"
ELECTRON_DIR="shell/electron"

# from: http://stackoverflow.com/a/17072017/142317
# The download-electron tasks seems to still create an Atom.app executable
# so we'll have to reference that until they change it to Electron.app
# https://github.com/atom/grunt-download-electron/issues/30
if [ "$(uname)" == "Darwin" ]; then
OS="mac"
EXE="Atom.app/Contents/MacOS/Atom"
Expand Down Expand Up @@ -56,12 +59,12 @@ RELEASE_RSRC="$RELEASE_DIR/$RESOURCES"
rm -rf $RELEASE_DIR $RELEASE_TARBALL

#----------------------------------------------------------------------
# Copy Atom installation and app directory into output location
# Copy Electron installation and app directory into output location
#----------------------------------------------------------------------

echo "Creating $RELEASE_DIR ..."
mkdir -p $RELEASE_DIR
cp -R $ATOM_DIR/* $RELEASE_DIR
cp -R $ELECTRON_DIR/* $RELEASE_DIR
rm -f $RELEASE_DIR/version
cp LICENSE.md $RELEASE_DIR/LICENSE

Expand Down
2 changes: 1 addition & 1 deletion script/build.sh
Expand Up @@ -18,7 +18,7 @@ npm --version >/dev/null 2>&1 || { echo >&2 "Please install npm before running t
# Ensure we start in project root
cd "$(dirname "${BASH_SOURCE[0]}")"; cd ..

# Ensure we have current version of atom-shell
# Ensure we have current version of electron
pushd shell
npm install grunt-cli
npm install
Expand Down
6 changes: 3 additions & 3 deletions script/light.sh
Expand Up @@ -9,11 +9,11 @@ cd "$(dirname "${BASH_SOURCE[0]}")"; cd ..
DIR=$(pwd)

if [ "$(uname)" == "Darwin" ]; then
CLI="${DIR}/shell/atom-shell/Atom.app/Contents/MacOS/Atom"
CLI="${DIR}/shell/electron/Atom.app/Contents/MacOS/Atom"
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
CLI="${DIR}/shell/atom-shell/atom"
CLI="${DIR}/shell/electron/atom"
elif [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
CLI="${DIR}/shell/atom-shell/atom.exe"
CLI="${DIR}/shell/electron/atom.exe"
else
echo "Cannot detect a supported OS."
exit 1
Expand Down
4 changes: 2 additions & 2 deletions shell/.gitignore
@@ -1,2 +1,2 @@
atom-shell
node_modules
electron
node_modules
2 changes: 1 addition & 1 deletion shell/Gruntfile.js
Expand Up @@ -5,7 +5,7 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),
"download-electron": {
version: "0.22.1",
outputDir: "./atom-shell",
outputDir: "./electron",
rebuild: true
}
});
Expand Down

0 comments on commit 682b1da

Please sign in to comment.