From 0cec2f2187d0d2a20437fbe65060b194726a3d1a Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Wed, 28 Nov 2018 14:21:03 +0300 Subject: [PATCH 1/3] `whereis iofog-controller` -> `npm root -g iofog-controller` --- scripts/postinstall.sh | 6 ++++-- scripts/preuninstall.sh | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 1b43ac973..61830784d 100644 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -54,13 +54,15 @@ if [ -f $PROD_DB_FILE_BACKUP ]; then fi #prev versions migrations -PREV_IOFOG_CONTROLLER_VER=$(grep prev_ver /tmp/iofogcontroller_install_variables | awk '{print $2}') -echo "Prev ver: "${PREV_IOFOG_CONTROLLER_VER} +if [ -f /tmp/iofogcontroller_install_variables ]; then + PREV_IOFOG_CONTROLLER_VER=$(grep prev_ver /tmp/iofogcontroller_install_variables | awk '{print $2}') +fi if [[ -z "${PREV_IOFOG_CONTROLLER_VER// }" ]] then echo "No prev ver" else + echo "Prev ver: "${PREV_IOFOG_CONTROLLER_VER} if [[ $(vercomp $PREV_IOFOG_CONTROLLER_VER 1.0.0) = '<' ]] || [[ $(vercomp $PREV_IOFOG_CONTROLLER_VER 1.0.0) = '=' ]] then echo "Upgrading from ver 1.0.0" diff --git a/scripts/preuninstall.sh b/scripts/preuninstall.sh index a08aff9c5..423220030 100644 --- a/scripts/preuninstall.sh +++ b/scripts/preuninstall.sh @@ -5,9 +5,9 @@ export PREV_IOFOG_CONTROLLER_VER=$(npm list --depth=0 -g --silent | grep iofogco printf 'prev_ver: '$PREV_IOFOG_CONTROLLER_VER > /tmp/iofogcontroller_install_variables #backup db -IOFOG_CONTROLLER_BIN_DIR=$(whereis iofog-controller | awk -F " " '{print $2}') -IOFOG_CONTROLLER_BIN_DIR=${IOFOG_CONTROLLER_BIN_DIR%"iofog-controller"} -IOFOG_CONTROLLER_SEQUELIZE_DIR=$IOFOG_CONTROLLER_BIN_DIR'../lib/node_modules/iofogcontroller/src/sequelize' +IOFOG_CONTROLLER_NODE_MODULES=$(npm root -g iofog-controller) +IOFOG_CONTROLLER_SEQUELIZE_DIR=$IOFOG_CONTROLLER_NODE_MODULES'/iofogcontroller/src/sequelize' +echo $IOFOG_CONTROLLER_SEQUELIZE_DIR DEV_DB_FILE=$IOFOG_CONTROLLER_SEQUELIZE_DIR'/dev_database.sqlite' if [ -f $DEV_DB_FILE ]; then From a07685a876d2a7da60e79196df102e1a147b7250 Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Wed, 28 Nov 2018 14:21:21 +0300 Subject: [PATCH 2/3] `whereis iofog-controller` -> `npm root -g iofog-controller` --- scripts/preuninstall.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/preuninstall.sh b/scripts/preuninstall.sh index 423220030..06e305749 100644 --- a/scripts/preuninstall.sh +++ b/scripts/preuninstall.sh @@ -7,7 +7,6 @@ printf 'prev_ver: '$PREV_IOFOG_CONTROLLER_VER > /tmp/iofogcontroller_install_var #backup db IOFOG_CONTROLLER_NODE_MODULES=$(npm root -g iofog-controller) IOFOG_CONTROLLER_SEQUELIZE_DIR=$IOFOG_CONTROLLER_NODE_MODULES'/iofogcontroller/src/sequelize' -echo $IOFOG_CONTROLLER_SEQUELIZE_DIR DEV_DB_FILE=$IOFOG_CONTROLLER_SEQUELIZE_DIR'/dev_database.sqlite' if [ -f $DEV_DB_FILE ]; then From 84a805ac11edf144eff5a5803d4950d65e5b300b Mon Sep 17 00:00:00 2001 From: maksimchepelev Date: Wed, 28 Nov 2018 14:38:20 +0300 Subject: [PATCH 3/3] `whereis iofog-controller` -> `npm root -g iofog-controller` --- scripts/postinstall.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 61830784d..728d5cd65 100644 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -60,12 +60,12 @@ fi if [[ -z "${PREV_IOFOG_CONTROLLER_VER// }" ]] then - echo "No prev ver" + echo "No previous version" else - echo "Prev ver: "${PREV_IOFOG_CONTROLLER_VER} + echo "Previous version: "${PREV_IOFOG_CONTROLLER_VER} if [[ $(vercomp $PREV_IOFOG_CONTROLLER_VER 1.0.0) = '<' ]] || [[ $(vercomp $PREV_IOFOG_CONTROLLER_VER 1.0.0) = '=' ]] then - echo "Upgrading from ver 1.0.0" + echo "Upgrading from version 1.0.0" sqlite3 src/sequelize/prod_database.sqlite "insert into SequelizeMeta (name) values ('20180928110125-insert-registry.js');" sqlite3 src/sequelize/prod_database.sqlite "insert into SequelizeMeta (name) values ('20180928111532-insert-catalog-item.js');" sqlite3 src/sequelize/prod_database.sqlite "insert into SequelizeMeta (name) values ('20180928112152-insert-iofog-type.js');"