Skip to content

Commit 68f8484

Browse files
committed
string was being parsed as single
1 parent 706e34c commit 68f8484

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

Diff for: Jenkinsfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -216,18 +216,17 @@ pipeline {
216216
set -e
217217
TEMPDIR=$(mktemp -d)
218218
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=looptest -v ${TEMPDIR}:/ansible/jenkins jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}
219-
CURRENTHASH=$(grep -hs ^ "${TEMPLATED_FILES}" | md5sum | cut -c1-8)
219+
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
220220
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
221-
NEWHASH=$(grep -hs ^ "${TEMPLATED_FILES}" | md5sum | cut -c1-8)
222-
echo "CURRENTHASH IS ${CURRENTHASH} NEWHASH IS ${NEWHASH}"
221+
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
223222
if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
224223
mkdir -p ${TEMPDIR}/repo
225224
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
226225
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f looptest
227226
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
228-
cp --parents "${TEMPLATED_FILES}" ${TEMPDIR}/repo/${LS_REPO}/
227+
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
229228
cd ${TEMPDIR}/repo/${LS_REPO}/
230-
git add "${TEMPLATED_FILES}"
229+
git add ${TEMPLATED_FILES}
231230
git commit -m 'Bot Updating Templated Files'
232231
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
233232
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}

Diff for: roles/generate-jenkins/templates/Jenkinsfile.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -380,17 +380,17 @@ pipeline {
380380
docker pull linuxserver/jenkins-builder:latest
381381
{% endif %}
382382
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH={{ ls_branch }} -v ${TEMPDIR}:/ansible/jenkins {% if project_name != "docker-jenkins-builder" %}linuxserver/jenkins-builder:latest{% else %}jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}{% endif %}
383-
CURRENTHASH=$(grep -hs ^ "${TEMPLATED_FILES}" | md5sum | cut -c1-8)
383+
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
384384
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
385-
NEWHASH=$(grep -hs ^ "${TEMPLATED_FILES}" | md5sum | cut -c1-8)
385+
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
386386
if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
387387
mkdir -p ${TEMPDIR}/repo
388388
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
389389
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f {{ ls_branch }}
390390
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
391-
cp --parents "${TEMPLATED_FILES}" ${TEMPDIR}/repo/${LS_REPO}/
391+
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
392392
cd ${TEMPDIR}/repo/${LS_REPO}/
393-
git add "${TEMPLATED_FILES}"
393+
git add ${TEMPLATED_FILES}
394394
git commit -m 'Bot Updating Templated Files'
395395
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
396396
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}

0 commit comments

Comments
 (0)