From e0021a05a638bba858c5be2eca2c75be08c58f25 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 18 Dec 2016 23:05:42 +0000
Subject: [PATCH] Fix warnings
---
src/freedombone-app-turtl | 22 ++++++++++++++++++++--
src/freedombone-utils-nodejs | 2 +-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl
index 768306e16..426304dab 100755
--- a/src/freedombone-app-turtl
+++ b/src/freedombone-app-turtl
@@ -84,6 +84,8 @@ function install_interactive_turtl {
else
function_check interactive_site_details
interactive_site_details "turtl" "TURTL_DOMAIN_NAME" "TURTL_CODE"
+ write_config_param "API_TURTL_DOMAIN_NAME" "api.${TURTL_DOMAIN_NAME}"
+ write_config_param "API_TURTL_CODE" "${TURTL_CODE}"
fi
APP_INSTALLED=1
}
@@ -124,7 +126,12 @@ function upgrade_turtl {
set_repo_commit $TURTL_BASE_DIR/api "turtl api commit" "$TURTL_API_COMMIT" $TURTL_API_REPO
nginx_dissite $TURTL_DOMAIN_NAME
cd /var/www/$TURTL_DOMAIN_NAME/htdocs
- npm install
+ rm -rf node_modules npm-shrinkwrap.json
+ npm install uglify@0.1.5 --no-optional
+ npm install minimatch@3.0.2 --no-optional
+ npm install --no-optional
+ sed -i 's|{config,controllers,handlers,locales,library,models,turtl}|.|g' Makefile
+ sed -i 's|tests/{data,tests}|tests|g' Makefile
make clean
make
chown -R turtl:turtl $TURTL_BASE_DIR
@@ -694,8 +701,19 @@ function install_turtl_app {
set_completion_param "turtl domain" "$TURTL_DOMAIN_NAME"
cd /var/www/$TURTL_DOMAIN_NAME/htdocs
- npm install
+ sed -i 's|GPLv3|GPL-3.0|g' package.json
+ sed -i "/license/a \"repository\": \"$TURTL_REPO\"," package.json
+ rm -rf node_modules npm-shrinkwrap.json
+ npm install uglify@0.1.5 --no-optional
+ npm install minimatch@3.0.2 --no-optional
+ npm install --no-optional
+
+ sed -i 's|{config,controllers,handlers,locales,library,models,turtl}|.|g' Makefile
+ sed -i 's|tests/{data,tests}|tests|g' Makefile
+
+ make clean
make
+
chown -R turtl:turtl /var/www/$TURTL_DOMAIN_NAME/htdocs
function_check create_site_certificate
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index ff7ae811d..68d07eff2 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -37,7 +37,7 @@ VARIANTS='mesh'
# have specifically the correct versions
NODEJS_VERSION='6.9.0'
NODEJS_N_VERSION='2.1.4'
-NPM_VERSION='4.0.2'
+NPM_VERSION='4.0.5'
# This file keeps track of the apps needing nodejs
# so that it can be removed if tere are no apps which need it
--
GitLab