From 8d199c97b1d7cdf9d28d815c04b0585f668405e0 Mon Sep 17 00:00:00 2001 From: Christoph Knote Date: Thu, 10 Mar 2022 16:45:57 +0100 Subject: [PATCH] Fix find argument, remove Makefile.am from git --- .gitignore | 3 +++ .gitlab-ci.yml | 2 +- build_dist.bash => build_dist.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) rename build_dist.bash => build_dist.sh (99%) diff --git a/.gitignore b/.gitignore index 9c434ad..350d7a7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ build src/kpp boxmox*.tar.gz +# bc we create this automatically using build_dist.sh +Makefile.am + doc/boxmox_README.pdf **.DS_Store diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3920427..d9b773d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ build: - DEBIAN_FRONTEND=noninteractive apt-get -qq install wget patch make gcc gfortran flex bison texlive autoconf autotools-dev - "[ -f ./version ] && export VERSION=$(cat ./version)" script: - - . build_dist.bash "$CI_PROJECT_DIR/build" + - . build_dist.sh "$CI_PROJECT_DIR/build" artifacts: name: boxmox-dist-$CI_COMMIT_SHORT_SHA paths: diff --git a/build_dist.bash b/build_dist.sh similarity index 99% rename from build_dist.bash rename to build_dist.sh index a66918d..546d39f 100755 --- a/build_dist.bash +++ b/build_dist.sh @@ -7,7 +7,7 @@ set -x cp Makefile.am_BLUEPRINT Makefile.am # list all files in these subdirectories -distFiles=$(find drv examples case_studies int models util -type file) +distFiles=$(find drv examples case_studies int models util -type f) #pretty print them 45 char wide dd tab, backslash at end remove backslash last line remove tab first line printf 'nobase_dist_pkgdata_DATA = %s\n' "${distFiles[*]}" | fmt -w 45 | sed -e 's/\(.*\)$/\t\1 \\/g' | sed '$ s/\\//g' | sed '1 s/\t//g' >> Makefile.am -- GitLab