From 82e3cfea42054b6b1e4fe5bfdccb7f9a485ceab6 Mon Sep 17 00:00:00 2001 From: Jozsef Makai Date: Fri, 11 Aug 2017 16:19:27 +0000 Subject: [PATCH] [CI] fixing carriage returns from github in shell script --- .../debian_scripts/publish_debian_cern.sh | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/packaging/debian_scripts/publish_debian_cern.sh b/packaging/debian_scripts/publish_debian_cern.sh index ffffc13e7d7..68f9105a72d 100755 --- a/packaging/debian_scripts/publish_debian_cern.sh +++ b/packaging/debian_scripts/publish_debian_cern.sh @@ -1,24 +1,25 @@ -#!/bin/bash - -#------------------------------------------------------------------------------- -# Publish debian artifacts on CERN Gitlab CI -# Author: Jozsef Makai (11.08.2017) -#------------------------------------------------------------------------------- - -set -e - -comp=$1 -prefix=/eos/project/s/storage-ci/www/debian/xrootd - -for dist in artful; do - echo "Publishing for $dist"; - path=$prefix/pool/$dist/$comp/x/xrootd/; - mkdir -p $path; - if [["$comp" == "master"]]; then find ${path} -type f -name '*.deb' -delete; fi - cp $dist/*.deb $path; - (cd $prefix && apt-ftparchive --arch amd64 packages pool/$dist/$comp/ > dists/$dist/$comp/binary-amd64/Packages); - gzip -c $prefix/dists/$dist/$comp/binary-amd64/Packages > $prefix/dists/$dist/$comp/binary-amd64/Packages.gz; - apt-ftparchive -o APT::FTPArchive::Release::Origin=CERN -o APT::FTPArchive::Release::Label=XrootD -o APT::FTPArchive::Release::Codename=artful -o APT::FTPArchive::Release::Architectures=amd64 -o APT::FTPArchive::Release::Components="master release stable-4.7.x" release $prefix/dists/$dist/ > $prefix/dists/$dist/Release; - gpg --homedir /home/stci/ --clearsign -o $prefix/dists/$dist/InRelease $prefix/dists/$dist/Release; - gpg --homedir /home/stci/ -abs -o $prefix/dists/$dist/Release.gpg $prefix/dists/$dist/Release; -done +#!/bin/bash + +#------------------------------------------------------------------------------- +# Publish debian artifacts on CERN Gitlab CI +# Author: Jozsef Makai (11.08.2017) +#------------------------------------------------------------------------------- + +set -e + +comp=$1 +prefix=/eos/project/s/storage-ci/www/debian/xrootd + +for dist in artful; do + echo "Publishing for $dist"; + path=$prefix/pool/$dist/$comp/x/xrootd/; + mkdir -p $path; + if [["$comp" == "master"]]; then find ${path} -type f -name '*.deb' -delete; fi + cp $dist/*.deb $path; + mkdir -p $prefix/dists/$dist/$comp/binary-amd64/; + (cd $prefix && apt-ftparchive --arch amd64 packages pool/$dist/$comp/ > dists/$dist/$comp/binary-amd64/Packages); + gzip -c $prefix/dists/$dist/$comp/binary-amd64/Packages > $prefix/dists/$dist/$comp/binary-amd64/Packages.gz; + apt-ftparchive -o APT::FTPArchive::Release::Origin=CERN -o APT::FTPArchive::Release::Label=XrootD -o APT::FTPArchive::Release::Codename=artful -o APT::FTPArchive::Release::Architectures=amd64 -o APT::FTPArchive::Release::Components="master release stable-4.7.x" release $prefix/dists/$dist/ > $prefix/dists/$dist/Release; + gpg --homedir /home/stci/ --clearsign -o $prefix/dists/$dist/InRelease $prefix/dists/$dist/Release; + gpg --homedir /home/stci/ -abs -o $prefix/dists/$dist/Release.gpg $prefix/dists/$dist/Release; +done