Skip to content

Commit c50caa9

Browse files
committed
with centos-7 fixes
1 parent 9dc7a08 commit c50caa9

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

‎ci/centos-7-setup-devtoolset-11.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ sudo sed -i '/mirrorlist/d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
77
sudo yum update -y
88
sudo yum install -y devtoolset-11
99
if ! grep "source /opt/rh/devtoolset-11/enable" /usr/lib/rpm/find-debuginfo.sh; then
10-
sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh
10+
sudo sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh
1111
fi
1212
source /opt/rh/devtoolset-11/enable

‎ci/fix-buildhost.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/usr/bin/env bash
2+
# it is expected that this file is sourced, not executed directly
23
set -ex
3-
thisdir="$(dirname "$0")"
4+
my_path="$(realpath "${BASH_SOURCE[0]}")"
5+
my_dir="$(dirname "$my_path")"
46

57
if [ -f /etc/os-release ]; then
68
source /etc/os-release
79
if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "7" ]; then
8-
source ./centos-7-setup-devtoolset-11.sh
10+
source "$my_dir"/centos-7-setup-devtoolset-11.sh
911
fi
1012
fi
1113

0 commit comments

Comments
 (0)