From df353be353e1ec25ac2a0e64a9eb617dcbc87703 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 21 Sep 2020 22:13:05 +0200 Subject: Use integration-java11 Dockerfile Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC Issue-ID: SDC-3298 Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3 Signed-off-by: xuegao --- asdctool/src/main/resources/scripts/UUIDFix1707.sh | 6 +++--- asdctool/src/main/resources/scripts/artifactsIdValidation.sh | 6 +++--- asdctool/src/main/resources/scripts/baseOperation.sh | 4 ++-- asdctool/src/main/resources/scripts/cleanCsar.sh | 6 +++--- asdctool/src/main/resources/scripts/deleteAllProducts.sh | 6 +++--- asdctool/src/main/resources/scripts/deleteComponentTool.sh | 6 +++--- asdctool/src/main/resources/scripts/derivedFromAlignment.sh | 6 +++--- asdctool/src/main/resources/scripts/distributionStatusUpdate1707.sh | 6 +++--- asdctool/src/main/resources/scripts/exportGraph.sh | 6 +++--- asdctool/src/main/resources/scripts/exportGraphAsGraphMl.sh | 6 +++--- asdctool/src/main/resources/scripts/exportUsers.sh | 6 +++--- asdctool/src/main/resources/scripts/fix_icons.sh | 6 +++--- asdctool/src/main/resources/scripts/fix_issue.sh | 6 +++--- asdctool/src/main/resources/scripts/generateCsar.sh | 6 +++--- asdctool/src/main/resources/scripts/groupsAlignment.sh | 6 +++--- asdctool/src/main/resources/scripts/importGraph.sh | 6 +++--- asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh | 6 +++--- asdctool/src/main/resources/scripts/migration1707RelationsFix.sh | 6 +++--- asdctool/src/main/resources/scripts/postMigration1707Fix.sh | 6 +++--- asdctool/src/main/resources/scripts/schemaCreation.sh | 6 +++--- asdctool/src/main/resources/scripts/sdc-migration.sh | 6 +++--- asdctool/src/main/resources/scripts/sdcSchemaFileImport.sh | 6 +++--- asdctool/src/main/resources/scripts/updateIsVnf.sh | 6 +++--- asdctool/src/main/resources/scripts/upgradePostMigration1710.sh | 6 +++--- asdctool/src/main/resources/scripts/validationTool.sh | 6 +++--- asdctool/src/main/resources/scripts/vfModulePropertiesAdding.sh | 6 +++--- asdctool/src/main/resources/scripts/vfcNameAlignment.sh | 6 +++--- asdctool/src/main/resources/scripts/vfmoduleFix1707.sh | 6 +++--- asdctool/src/main/resources/scripts/vrfObjectFix.sh | 6 +++--- 29 files changed, 86 insertions(+), 86 deletions(-) (limited to 'asdctool/src') diff --git a/asdctool/src/main/resources/scripts/UUIDFix1707.sh b/asdctool/src/main/resources/scripts/UUIDFix1707.sh index 0ceb0a0346..71cda4bccc 100644 --- a/asdctool/src/main/resources/scripts/UUIDFix1707.sh +++ b/asdctool/src/main/resources/scripts/UUIDFix1707.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Distribution Status Update 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ArtifactUUIDFixMenu" diff --git a/asdctool/src/main/resources/scripts/artifactsIdValidation.sh b/asdctool/src/main/resources/scripts/artifactsIdValidation.sh index 9064a64c6d..9c60aa76cf 100644 --- a/asdctool/src/main/resources/scripts/artifactsIdValidation.sh +++ b/asdctool/src/main/resources/scripts/artifactsIdValidation.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Artifact Validator Tool # @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ArtifactValidatorTool" diff --git a/asdctool/src/main/resources/scripts/baseOperation.sh b/asdctool/src/main/resources/scripts/baseOperation.sh index b27b734276..ffa101e26d 100644 --- a/asdctool/src/main/resources/scripts/baseOperation.sh +++ b/asdctool/src/main/resources/scripts/baseOperation.sh @@ -1,9 +1,9 @@ -#!/bin/bash +#!/bin/sh CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else diff --git a/asdctool/src/main/resources/scripts/cleanCsar.sh b/asdctool/src/main/resources/scripts/cleanCsar.sh index c11cdef8f8..a5fba0a927 100644 --- a/asdctool/src/main/resources/scripts/cleanCsar.sh +++ b/asdctool/src/main/resources/scripts/cleanCsar.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/deleteAllProducts.sh b/asdctool/src/main/resources/scripts/deleteAllProducts.sh index 474b6c8980..07dbae122b 100644 --- a/asdctool/src/main/resources/scripts/deleteAllProducts.sh +++ b/asdctool/src/main/resources/scripts/deleteAllProducts.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ##################################### # delete all products from JanusGraph @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.RemoveUtils" diff --git a/asdctool/src/main/resources/scripts/deleteComponentTool.sh b/asdctool/src/main/resources/scripts/deleteComponentTool.sh index afdf8166f5..0c65d54386 100644 --- a/asdctool/src/main/resources/scripts/deleteComponentTool.sh +++ b/asdctool/src/main/resources/scripts/deleteComponentTool.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Distribution Status Update 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.DeleteComponentTool" diff --git a/asdctool/src/main/resources/scripts/derivedFromAlignment.sh b/asdctool/src/main/resources/scripts/derivedFromAlignment.sh index 05025a01c0..c9ee64b6b4 100644 --- a/asdctool/src/main/resources/scripts/derivedFromAlignment.sh +++ b/asdctool/src/main/resources/scripts/derivedFromAlignment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/distributionStatusUpdate1707.sh b/asdctool/src/main/resources/scripts/distributionStatusUpdate1707.sh index a9d308f933..3be4a498aa 100644 --- a/asdctool/src/main/resources/scripts/distributionStatusUpdate1707.sh +++ b/asdctool/src/main/resources/scripts/distributionStatusUpdate1707.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Distribution Status Update 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/exportGraph.sh b/asdctool/src/main/resources/scripts/exportGraph.sh index 648cb50669..41874d5bdc 100644 --- a/asdctool/src/main/resources/scripts/exportGraph.sh +++ b/asdctool/src/main/resources/scripts/exportGraph.sh @@ -1,16 +1,16 @@ -#!/bin/bash +#!/bin/sh CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ExportImportMenu" diff --git a/asdctool/src/main/resources/scripts/exportGraphAsGraphMl.sh b/asdctool/src/main/resources/scripts/exportGraphAsGraphMl.sh index 17d660ce4e..bd8f51a40b 100644 --- a/asdctool/src/main/resources/scripts/exportGraphAsGraphMl.sh +++ b/asdctool/src/main/resources/scripts/exportGraphAsGraphMl.sh @@ -1,16 +1,16 @@ -#!/bin/bash +#!/bin/sh CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ExportImportMenu" diff --git a/asdctool/src/main/resources/scripts/exportUsers.sh b/asdctool/src/main/resources/scripts/exportUsers.sh index fec7d5abe4..4a6d0fe8da 100644 --- a/asdctool/src/main/resources/scripts/exportUsers.sh +++ b/asdctool/src/main/resources/scripts/exportUsers.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ################################## # export all users from JanusGraph @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ExportImportMenu" diff --git a/asdctool/src/main/resources/scripts/fix_icons.sh b/asdctool/src/main/resources/scripts/fix_icons.sh index 230dea7218..dfa50aa9ec 100644 --- a/asdctool/src/main/resources/scripts/fix_icons.sh +++ b/asdctool/src/main/resources/scripts/fix_icons.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/fix_issue.sh b/asdctool/src/main/resources/scripts/fix_issue.sh index af63ec525d..7c4d426136 100644 --- a/asdctool/src/main/resources/scripts/fix_issue.sh +++ b/asdctool/src/main/resources/scripts/fix_issue.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/generateCsar.sh b/asdctool/src/main/resources/scripts/generateCsar.sh index c74168823c..fb01c2fb9b 100644 --- a/asdctool/src/main/resources/scripts/generateCsar.sh +++ b/asdctool/src/main/resources/scripts/generateCsar.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Distribution Status Update 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.CsarGeneratorTool" diff --git a/asdctool/src/main/resources/scripts/groupsAlignment.sh b/asdctool/src/main/resources/scripts/groupsAlignment.sh index 742b246a48..7ce927aa07 100644 --- a/asdctool/src/main/resources/scripts/groupsAlignment.sh +++ b/asdctool/src/main/resources/scripts/groupsAlignment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Groups Alignment @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/importGraph.sh b/asdctool/src/main/resources/scripts/importGraph.sh index ffdd2fddb0..4d4dd69ef0 100644 --- a/asdctool/src/main/resources/scripts/importGraph.sh +++ b/asdctool/src/main/resources/scripts/importGraph.sh @@ -1,16 +1,16 @@ -#!/bin/bash +#!/bin/sh CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ExportImportMenu" diff --git a/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh b/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh index d4b7871f30..d964c997b2 100644 --- a/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh +++ b/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # JanusGraph Schema Creation @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.DataSchemaMenu" diff --git a/asdctool/src/main/resources/scripts/migration1707RelationsFix.sh b/asdctool/src/main/resources/scripts/migration1707RelationsFix.sh index c930243750..0e7ce424c6 100644 --- a/asdctool/src/main/resources/scripts/migration1707RelationsFix.sh +++ b/asdctool/src/main/resources/scripts/migration1707RelationsFix.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration: fix relations after migration 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/postMigration1707Fix.sh b/asdctool/src/main/resources/scripts/postMigration1707Fix.sh index 56a16db70a..0d25d7c476 100644 --- a/asdctool/src/main/resources/scripts/postMigration1707Fix.sh +++ b/asdctool/src/main/resources/scripts/postMigration1707Fix.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/schemaCreation.sh b/asdctool/src/main/resources/scripts/schemaCreation.sh index 657db5e6f1..fbc2251ff7 100644 --- a/asdctool/src/main/resources/scripts/schemaCreation.sh +++ b/asdctool/src/main/resources/scripts/schemaCreation.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.DataSchemaMenu" diff --git a/asdctool/src/main/resources/scripts/sdc-migration.sh b/asdctool/src/main/resources/scripts/sdc-migration.sh index 15e6d6b6e1..c369800e29 100644 --- a/asdctool/src/main/resources/scripts/sdc-migration.sh +++ b/asdctool/src/main/resources/scripts/sdc-migration.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -10,14 +10,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.migration.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/sdcSchemaFileImport.sh b/asdctool/src/main/resources/scripts/sdcSchemaFileImport.sh index 4002e388da..afe6b65793 100644 --- a/asdctool/src/main/resources/scripts/sdcSchemaFileImport.sh +++ b/asdctool/src/main/resources/scripts/sdcSchemaFileImport.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Sdc Schema File Import # @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.SdcSchemaFileImport" diff --git a/asdctool/src/main/resources/scripts/updateIsVnf.sh b/asdctool/src/main/resources/scripts/updateIsVnf.sh index bf45fa88b5..4d15b042bb 100644 --- a/asdctool/src/main/resources/scripts/updateIsVnf.sh +++ b/asdctool/src/main/resources/scripts/updateIsVnf.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ######################################################################## # @@ -10,14 +10,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.UpdateIsVnfMenu" diff --git a/asdctool/src/main/resources/scripts/upgradePostMigration1710.sh b/asdctool/src/main/resources/scripts/upgradePostMigration1710.sh index 927d148d88..3b58fdc248 100644 --- a/asdctool/src/main/resources/scripts/upgradePostMigration1710.sh +++ b/asdctool/src/main/resources/scripts/upgradePostMigration1710.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration: Upgrade Post Migration 1710 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.migration.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/validationTool.sh b/asdctool/src/main/resources/scripts/validationTool.sh index 58cd7f3f6a..6ac0541d39 100644 --- a/asdctool/src/main/resources/scripts/validationTool.sh +++ b/asdctool/src/main/resources/scripts/validationTool.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Validation Tool # @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ValidationTool" diff --git a/asdctool/src/main/resources/scripts/vfModulePropertiesAdding.sh b/asdctool/src/main/resources/scripts/vfModulePropertiesAdding.sh index 1ead2484db..7fd40967ba 100644 --- a/asdctool/src/main/resources/scripts/vfModulePropertiesAdding.sh +++ b/asdctool/src/main/resources/scripts/vfModulePropertiesAdding.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration: Adding new properties to vfModules @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/vfcNameAlignment.sh b/asdctool/src/main/resources/scripts/vfcNameAlignment.sh index 10fbb257ef..a7578ec6db 100644 --- a/asdctool/src/main/resources/scripts/vfcNameAlignment.sh +++ b/asdctool/src/main/resources/scripts/vfcNameAlignment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/vfmoduleFix1707.sh b/asdctool/src/main/resources/scripts/vfmoduleFix1707.sh index 48579242bf..6f08fa2175 100644 --- a/asdctool/src/main/resources/scripts/vfmoduleFix1707.sh +++ b/asdctool/src/main/resources/scripts/vfmoduleFix1707.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Distribution Status Update 1707 @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" diff --git a/asdctool/src/main/resources/scripts/vrfObjectFix.sh b/asdctool/src/main/resources/scripts/vrfObjectFix.sh index 3f875fa136..a3eb067612 100644 --- a/asdctool/src/main/resources/scripts/vrfObjectFix.sh +++ b/asdctool/src/main/resources/scripts/vrfObjectFix.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################## # Data Migration @@ -7,14 +7,14 @@ CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) -if [ ${BASEDIR:0:1} = "/" ] +if [ `echo ${BASEDIR} | cut -c1-1` = "/" ] then FULL_PATH=$BASEDIR else FULL_PATH=$CURRENT_DIR/$BASEDIR fi -source ${FULL_PATH}/baseOperation.sh +. ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.VrfObjectFixMenu" -- cgit 1.2.3-korg