Merge pull request #559 from jmakai/master

[CI] fixing carriage returns from github in shell script
xrootd · Aug 11, 2017 · 14ced68 · 14ced68
2 parents 5c93d03 + 82e3cfe
commit 14ced68
Showing 1 changed file with 25 additions and 24 deletions.
diff --git 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 <jmakai@cern.ch> (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 <jmakai@cern.ch> (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