From 9a3f81dd63f791470dfd9eb55367c7e18e584293 Mon Sep 17 00:00:00 2001
From: Exile <exile@chamber.ee>
Date: Mon, 29 Oct 2018 14:02:26 +0000
Subject: [PATCH 1/3] Take npm install scenario into consideration. Fixes #56

- Splits postinstall to preinstall and postinstall
- Considers the path logic when installed via NPM
- Able to install via npm but still in inoperable state
- Version bump
---
 History.md   | 4 ++++
 package.json | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 27cb7c1cf..f04c863ff 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+v2.3.1
+======
+* Make it possible to install Pylon via NPM (intended for further testing)
+
 v2.3.0
 ======
 * Renaming the project to Pylon IDE - Minimum set of changes #48
diff --git a/package.json b/package.json
index d90a78755..c6dbe6f41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "pln",
     "description": "Pylon IDE",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "homepage": "http://github.com/pylonide/pylon",
     "engines": {
         "node": ">= 4.9.1"
@@ -65,6 +65,7 @@
     "scripts": {
         "start": "./bin/pylon.sh",
         "test": "./test/run-tests.sh",
-        "postinstall": "cd node_modules/ace; make clean pre_build; ./Makefile.dryice.js minimal; cd ../..; make worker"
+        "preinstall": "if [ -d 'node_modules/ace' ]; then cd node_modules/ace; else mkdir -p node_modules; ln -s ../../ace node_modules/ace; ln -s ../../treehugger node_modules/treehugger; cd ../ace; fi; make clean pre_build; ./Makefile.dryice.js minimal;",
+        "postinstall": "make worker; if [ -L 'node_modules/ace' ]; then rm node_modules/ace; rm node_modules/treehugger; rmdir node_modules; fi"
     }
 }

From c3a753ad93840938fd8487a5b28641564b90b227 Mon Sep 17 00:00:00 2001
From: Exile <exile@chamber.ee>
Date: Mon, 29 Oct 2018 14:12:06 +0000
Subject: [PATCH 2/3] Removed unused postinstall script

---
 postinstall.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100755 postinstall.sh

diff --git a/postinstall.sh b/postinstall.sh
deleted file mode 100755
index 49b709a11..000000000
--- a/postinstall.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-cd node_modules/ace; make clean build; cd ../..
-cd node_modules/packager && rm -rf node_modules && sm install && cd ../..
-
-make
-
-node ./node_modules/mappings/scripts/postinstall-notice.js

From 1b700228af930e66ef8b2ce6c2c7a95ff0f06ba2 Mon Sep 17 00:00:00 2001
From: Exile <exile@chamber.ee>
Date: Mon, 29 Oct 2018 14:36:44 +0000
Subject: [PATCH 3/3] Merging preinstall and postinstall #56

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c6dbe6f41..07b6f0c6c 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "scripts": {
         "start": "./bin/pylon.sh",
         "test": "./test/run-tests.sh",
-        "preinstall": "if [ -d 'node_modules/ace' ]; then cd node_modules/ace; else mkdir -p node_modules; ln -s ../../ace node_modules/ace; ln -s ../../treehugger node_modules/treehugger; cd ../ace; fi; make clean pre_build; ./Makefile.dryice.js minimal;",
-        "postinstall": "make worker; if [ -L 'node_modules/ace' ]; then rm node_modules/ace; rm node_modules/treehugger; rmdir node_modules; fi"
+        "postinstall": "if [ -d 'node_modules/ace' ]; then cd node_modules/ace; else mkdir -p node_modules; ln -s ../../ace node_modules/ace; ln -s ../../treehugger node_modules/treehugger; cd ../ace; fi; make clean pre_build; ./Makefile.dryice.js minimal; cd ../..; make worker; if [ -L 'node_modules/ace' ]; then rm node_modules/ace; rm node_modules/treehugger; rmdir node_modules; fi"
     }
 }