free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings

This commit is contained in:
Bob Mottram 2016-12-18 23:05:42 +00:00
parent 170be59379
commit e0021a05a6
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/freedombone-app-turtl
View File

@ -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

2
src/freedombone-utils-nodejs
View File

@ -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