From 49baacab5f79a5b3a50bf0e5b1b2b312dc77c3fb Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 15 Dec 2020 13:02:15 -0600 Subject: [PATCH] [cvmfs_config_package] wget and dpkg -i deb --- action.yml | 2 +- setup-cvmfs.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index e8abb9e..4e0a4cd 100644 --- a/action.yml +++ b/action.yml @@ -15,7 +15,7 @@ inputs: cvmfs_config_package: description: 'URL of cvmfs config package to install' required: false - default: 'cvmfs-config-default' + default: '' runs: using: "composite" steps: diff --git a/setup-cvmfs.sh b/setup-cvmfs.sh index be1134b..26514b2 100755 --- a/setup-cvmfs.sh +++ b/setup-cvmfs.sh @@ -4,9 +4,16 @@ wget -q https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb sudo dpkg -i cvmfs-release-latest_all.deb sudo apt-get -q update -sudo apt-get -q -y install cvmfs ${INPUT_CVMFS_CONFIG_PACKAGE:-cvmfs-config-default} +sudo apt-get -q -y install cvmfs cvmfs-config-default rm -f cvmfs-release-latest_all.deb +# Install custom config +if [ ! -z "${INPUT_CVMFS_CONFIG_PACKAGE}" ] ; then + wget -O cvmfs-config.deb ${INPUT_CVMFS_CONFIG_PACKAGE} + sudo dpkg -i cvmfs-config.deb + rm -f cvmfs-config.deb +fi + # Setup default.local sudo mkdir -p /etc/cvmfs echo "CVMFS_REPOSITORIES=${INPUT_CVMFS_REPOSITORIES:-atlas.cern.ch,atlas-condb.cern.ch,grid.cern.ch}" | sudo tee /etc/cvmfs/default.local