osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email )
Change subject: 5gc: testenv: use TESTENV_INSTALL_DIR
......................................................................
5gc: testenv: use TESTENV_INSTALL_DIR
Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c
---
M 5gc/open5gs/open5gs_prepare.sh
1 file changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/80/40380/1
diff --git a/5gc/open5gs/open5gs_prepare.sh b/5gc/open5gs/open5gs_prepare.sh
index 2946f21..7378980 100755
--- a/5gc/open5gs/open5gs_prepare.sh
+++ b/5gc/open5gs/open5gs_prepare.sh
@@ -1,20 +1,7 @@
#!/bin/sh -ex
-set_ogs_sysconf_dir() {
- if [ -z "$OSMO_DEV_MAKE_DIR" ]; then
- # With --binary-repo
- OGS_INSTALL_DIR="/"
- OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/etc/"
- else
- # Without --binary-repo
- OGS_INSTALL_DIR="$OSMO_DEV_MAKE_DIR"/..
- OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/usr/etc/"
- fi
-}
-
adjust_sysconfdir_config() {
- sed -i "s~@sysconfdir@~$1~g" $2
+ sed -i "s~@sysconfdir@~$TESTENV_INSTALL_DIR/etc/~g" $1
}
-set_ogs_sysconf_dir
-adjust_sysconfdir_config "$OGS_SYSCONF_DIR" ./*.yaml
+adjust_sysconfdir_config ./*.yaml
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c
Gerrit-Change-Number: 40380
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osm...@sysmocom.de>
