Remove escape from \${FEATURESCONF} 24/53824/1
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 24 Mar 2017 22:40:59 +0000 (15:40 -0700)
committerJamo Luhrsen <jluhrsen@redhat.com>
Fri, 24 Mar 2017 22:40:59 +0000 (15:40 -0700)
Change-Id: Ib732b576c7294d95f7821ff7f8d49528892aa903
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
jjb/integration/include-raw-integration-deploy-controller-verify.sh
jjb/integration/include-raw-integration-distribution-check.sh

index 64633893f58fba95a7a678c806daf1a2ccba741b..bd74574dabdb29540cc0fa8a5a0b90a8ef019e61 100644 (file)
@@ -15,7 +15,7 @@ unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
 FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" \${FEATURESCONF}
+sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
index 4114bab05a174b0c845bf0baef325f4d0137e4fe..01c6f02db1e1777595f7a5ffab3d0e303765a1d0 100644 (file)
@@ -19,7 +19,7 @@ unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
 FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" \${FEATURESCONF}
+sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
 cat ${FEATURESCONF}