revert commits to master (these are on a new branch)

Author: toddtreece

scripts/deb/CMakeLists.txt

@@ -23,8 +23,8 @@ set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_PACKAGE_VENDOR "Adafruit")
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "9")
-set(CPACK_PACKAGE_VERSION "0.3.9")
+set(CPACK_PACKAGE_VERSION_PATCH "7")
+set(CPACK_PACKAGE_VERSION "0.3.7")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Adafruit WebIDE")
 set(CPACK_RESOURCE_FILE_README "${EDITOR_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${EDITOR_DIR}/GNU-AGPL-3.0")
@@ -33,8 +33,8 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Adafruit")
 set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-ubuntu")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "node, redis-server, git, restartd, libcap2-bin, avahi-daemon, i2c-tools, python-smbus")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "nodejs, nodejs-legacy, redis-server, git, restartd, libcap2-bin, avahi-daemon, i2c-tools, python-smbus")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm;")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "armhf")
 
-include(CPack)
+include(CPack)

scripts/deb/postinst

@@ -8,17 +8,22 @@ groupadd webide || true
 useradd -g webide webide || true
 usermod -a -G i2c,sudo webide || true
 
-cd $WEBIDE_ROOT
-/usr/local/bin/npm install
-
 chown -R webide:webide "$WEBIDE_HOME"
 chown -R webide:webide "$WEBIDE_ROOT"
 
 echo 'webide "node" "service adafruit-webide.sh restart" ""' >> /etc/restartd.conf
 
 cd /etc/init.d
 
-NODE_PATH="/usr/local/bin/node"
+NODE_PATH=""
+ARCH=$(dpkg --print-architecture)
+if [ $ARCH = armhf ]; then
+  NODE_PATH="\/usr\/share\/adafruit\/webide\/bin\/node_hf\/node"
+  chmod +x "$WEBIDE_ROOT/bin/node_hf/node"
+else
+  NODE_PATH="\/usr\/share\/adafruit\/webide\/bin\/node_sf\/node"
+  chmod +x "$WEBIDE_ROOT/bin/node_sf/node"
+fi
 sed -i "s/NODE_PATH/$NODE_PATH/g" adafruit-webide.sh
 
 update-rc.d adafruit-webide.sh defaults
@@ -53,4 +58,4 @@ echo "**** The Adafruit WebIDE is installed and running! ****"
 echo "**** Commands: sudo service adafruit-webide.sh {start,stop,restart} ****"
 echo "**** Navigate to http://$(hostname).local$PORT_USED to use the WebIDE"
 
-exit 0
+exit 0