From a2d9cf5121c8d919e4e35eae3e9a7d1172b55bb9 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 21 Oct 2021 13:06:12 +0200 Subject: rename index script --- .gitlab-ci.yml | 2 +- scripts/make-index.sh | 46 ------------------------------------------- scripts/virt-builder-index.sh | 46 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 47 deletions(-) delete mode 100755 scripts/make-index.sh create mode 100755 scripts/virt-builder-index.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f16b19f..87f37c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: done - xz --verbose $(ls *.tar *.qcow2) - mv --verbose *.xz $CI_JOB_NAME - - (cd $CI_JOB_NAME; for info in *.info; do test -f "$info" || continue; ../scripts/make-index.sh $info; done) + - (cd $CI_JOB_NAME; for info in *.info; do test -f "$info" || continue; ../scripts/virt-builder-index.sh $info; done) - name="$CI_JOB_NAME images" - base="$CI_JOB_URL/artifacts/raw/$CI_JOB_NAME" - tree -i -f -s -h -D --charset utf8 -T "$name" -H "$base" $CI_JOB_NAME > index.html diff --git a/scripts/make-index.sh b/scripts/make-index.sh deleted file mode 100755 index 68c41f7..0000000 --- a/scripts/make-index.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# create virt builder index snippets -# - -info="$1" -base="${info%.info}" -dest="${base}.index" -name="${base##*/}" - -file="$(jq -r .filename $info)" -if test ! -f "$file"; then - file="${file}.xz" -fi -if test ! -f "$file"; then - echo "ERROR: file ${file} not found" - exit 1 -fi - -name="${name%-x86_64}" -case "$file" in - *x86_64*) - arch="x86_64" - ;; - *) - echo "ERROR: unknown arch" - exit 1 - ;; -esac - -size="$(jq -r '."virtual-size"' $info)" -csum="$(sha256sum $file | cut -d' ' -f1)" -comp="$(du --bytes $file | cut -d' ' -f1)" - -cat < - -EOF diff --git a/scripts/virt-builder-index.sh b/scripts/virt-builder-index.sh new file mode 100755 index 0000000..68c41f7 --- /dev/null +++ b/scripts/virt-builder-index.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# +# create virt builder index snippets +# + +info="$1" +base="${info%.info}" +dest="${base}.index" +name="${base##*/}" + +file="$(jq -r .filename $info)" +if test ! -f "$file"; then + file="${file}.xz" +fi +if test ! -f "$file"; then + echo "ERROR: file ${file} not found" + exit 1 +fi + +name="${name%-x86_64}" +case "$file" in + *x86_64*) + arch="x86_64" + ;; + *) + echo "ERROR: unknown arch" + exit 1 + ;; +esac + +size="$(jq -r '."virtual-size"' $info)" +csum="$(sha256sum $file | cut -d' ' -f1)" +comp="$(du --bytes $file | cut -d' ' -f1)" + +cat < + +EOF -- cgit