Skip to content

Commit a8dabfd

Browse files
Add env var OBS_PROJECT
1 parent 3c85f8b commit a8dabfd

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

packages/scripts/install.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ END
3838

3939
set -eu
4040

41+
OBS_PROJECT=${OBS_PROJECT:-"devel:languages:crystal"}
4142
DISTRO_REPO=${DISTRO_REPO:-}
4243
CRYSTAL_VERSION="latest"
4344
CHANNEL="stable"
@@ -146,8 +147,8 @@ _install_apt() {
146147
fi
147148

148149
# Add repo signign key
149-
wget -qO- https://download.opensuse.org/repositories/devel:languages:crystal/${DISTRO_REPO}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/devel_languages_crystal.gpg > /dev/null
150-
echo "deb http://download.opensuse.org/repositories/devel:/languages:/crystal/${DISTRO_REPO}/ /" | tee /etc/apt/sources.list.d/crystal.list
150+
wget -qO- https://download.opensuse.org/repositories/${OBS_PROJECT}/${DISTRO_REPO}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/devel_languages_crystal.gpg > /dev/null
151+
echo "deb http://download.opensuse.org/repositories/${OBS_PROJECT}/${DISTRO_REPO}/ /" | tee /etc/apt/sources.list.d/crystal.list
151152
apt-get update
152153

153154
if [[ "$CRYSTAL_VERSION" == "latest" ]]; then
@@ -159,7 +160,7 @@ _install_apt() {
159160
}
160161

161162
_install_rpm_key() {
162-
rpm --verbose --import https://build.opensuse.org/projects/devel:languages:crystal/public_key
163+
rpm --verbose --import https://build.opensuse.org/projects/${OBS_PROJECT}/public_key
163164
}
164165

165166
_install_yum() {
@@ -169,9 +170,9 @@ _install_yum() {
169170
[crystal]
170171
name=Crystal (${DISTRO_REPO})
171172
type=rpm-md
172-
baseurl=https://download.opensuse.org/repositories/devel:/languages:/crystal/${DISTRO_REPO}/
173+
baseurl=https://download.opensuse.org/repositories/${OBS_PROJECT}/${DISTRO_REPO}/
173174
gpgcheck=1
174-
gpgkey=https://download.opensuse.org/repositories/devel:/languages:/crystal/${DISTRO_REPO}/repodata/repomd.xml.key
175+
gpgkey=https://download.opensuse.org/repositories/${OBS_PROJECT}/${DISTRO_REPO}/repodata/repomd.xml.key
175176
enabled=1
176177
EOF
177178

@@ -192,7 +193,7 @@ EOF
192193
_install_dnf() {
193194
_install_rpm_key
194195

195-
dnf config-manager --add-repo https://download.opensuse.org/repositories/devel:languages:crystal/$DISTRO_REPO/devel:languages:crystal.repo
196+
dnf config-manager --add-repo https://download.opensuse.org/repositories/${OBS_PROJECT}/$DISTRO_REPO/${OBS_PROJECT}.repo
196197

197198
if [[ "$CRYSTAL_VERSION" == "latest" ]]; then
198199
dnf install -y crystal
@@ -215,7 +216,7 @@ _install_zypper() {
215216
fi
216217

217218
_install_rpm_key
218-
zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:languages:crystal/$DISTRO_REPO/devel:languages:crystal.repo
219+
zypper --non-interactive addrepo https://download.opensuse.org/repositories/${OBS_PROJECT}/$DISTRO_REPO/${OBS_PROJECT}.repo
219220
zypper --non-interactive refresh
220221

221222
if [[ "$CRYSTAL_VERSION" == "latest" ]]; then

packages/test-install-on-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -eu
44

55
docker_image="${1}"
66

7-
docker run --rm -it -v $(pwd)/scripts:/scripts -v $(pwd)/support:/support $docker_image /support/test-install.sh
7+
docker run -e OBS_PROJECT="${OBS_PROJECT:-}" --rm -it -v $(pwd)/scripts:/scripts -v $(pwd)/support:/support $docker_image /support/test-install.sh

0 commit comments

Comments
 (0)