From fb3b421f20c9baca867d5bcb106886677c8d318f Mon Sep 17 00:00:00 2001 From: kexkey Date: Tue, 11 Dec 2018 16:56:11 -0500 Subject: [PATCH] Cleaned obsolete files --- dist/setup.sh | 17 +++++------------ .../generators/app/prompters/999_installer.js | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dist/setup.sh b/dist/setup.sh index 86f0ea3..9520427 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -486,7 +486,6 @@ install_docker() { fi copy_file $sourceDataPath/installer/docker/docker-compose.yaml docker-compose.yaml - copy_file $sourceDataPath/installer/testinstall.sh testinstall.sh 0 copy_file $sourceDataPath/installer/testfeatures.sh testfeatures.sh 0 copy_file $sourceDataPath/installer/start.sh start.sh 0 copy_file $sourceDataPath/installer/stop.sh stop.sh 0 @@ -503,17 +502,11 @@ install_docker() { next fi - if [[ ! -x testinstall.sh ]]; then - step " make testinstall.sh executable" - try chmod +x testinstall.sh - next - fi - - if [[ ! -x testfeatures.sh ]]; then - step " make testfeatures.sh executable" - try chmod +x testfeatures.sh - next - fi + if [[ ! -x testfeatures.sh ]]; then + step " make testfeatures.sh executable" + try chmod +x testfeatures.sh + next + fi } check_directory_owner() { diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js index 6c400b6..d2231ba 100644 --- a/install/generator-cyphernode/generators/app/prompters/999_installer.js +++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js @@ -123,8 +123,8 @@ module.exports = { }, templates: function( props ) { if( props.installer_mode === 'docker' ) { - return ['config.sh','start.sh', 'stop.sh', 'testinstall.sh', 'testfeatures.sh', path.join('docker', 'docker-compose.yaml')]; + return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh', path.join('docker', 'docker-compose.yaml')]; } - return ['config.sh','start.sh', 'stop.sh', 'testinstall.sh', 'testfeatures.sh']; + return ['config.sh','start.sh', 'stop.sh', 'testfeatures.sh']; } };