Merge branch 'alpha' into glv-1.28.0

scripts/cnode-helper-scripts/guild-deploy.sh

@@ -216,10 +216,8 @@ os_dependencies() {
       if [[ "${DISTRO}" =~ Rocky ]]; then
         #RockyLinux 8/9
         pkg_list="${pkg_list} --enablerepo=devel,crb libusbx ncurses-compat-libs pkgconf-pkg-config"
-      elif [[ "${DISTRO}" =~ "Red Hat" ]] || [[ "${VERSION_ID}" =~ "8" ]]; then
-        pkg_list="${pkg_list} --enablerepo=codeready-builder-for-rhel-8-x86_64-rpms libusbx ncurses-compat-libs pkgconf-pkg-config"
-      elif [[ "${DISTRO}" =~ "Red Hat" ]] || [[ "${VERSION_ID}" =~ "9" ]]; then
-        pkg_list="${pkg_list} --enablerepo=codeready-builder-for-rhel-9-x86_64-rpms libusbx ncurses-compat-libs pkgconf-pkg-config"
+      elif [[ "${DISTRO}" =~ "Red Hat" ]]; then
+        pkg_list="${pkg_list} --enablerepo=codeready-builder-for-rhel-${VERSION_ID/.*/}-x86_64-rpms libusbx ncurses-compat-libs pkgconf-pkg-config"
       fi
     elif [[ "${DISTRO}" =~ Fedora ]]; then
       #Fedora
@@ -431,7 +429,7 @@ download_ogmios() {
   if command -v ogmios >/dev/null; then ogmios_version="$(ogmios --version)"; else ogmios_version="v0.0.0"; fi
   rm -rf /tmp/ogmios && mkdir /tmp/ogmios
   pushd /tmp/ogmios >/dev/null || err_exit
-  ogmios_asset_url="$(curl -s https://api.github.com/repos/CardanoSolutions/ogmios/releases | jq -r '.[0].assets[].browser_download_url')"
+  ogmios_asset_url="$(curl -s https://api.github.com/repos/CardanoSolutions/ogmios/releases | jq -r '.[].assets[].browser_download_url' | grep linux.zip | head -1)"
   if curl -sL -f -m ${CURL_TIMEOUT} -o ogmios.zip ${ogmios_asset_url}; then
     unzip ogmios.zip &>/dev/null
     rm -f ogmios.zip

scripts/cnode-helper-scripts/mithril-client.sh

@@ -15,6 +15,9 @@
 # Do NOT modify code below           #
 ######################################
 
+U_ID=$(id -u)
+G_ID=$(id -g)
+
 #####################
 # Functions         #
 #####################
@@ -34,6 +37,10 @@ usage() {
 
 
 generate_environment_file() {
+  if [[ ! -d "${CNODE_HOME}/mithril/data-stores" ]]; then
+    sudo mkdir -p "${CNODE_HOME}"/mithril/data-stores
+    sudo chown -R "$U_ID":"$G_ID" "${CNODE_HOME}"/mithril 2>/dev/null
+  fi
   if [[ -n "${POOL_NAME}" ]] && [[ "${POOL_NAME}" != "CHANGE_ME" ]]; then
     export ERA_READER_ADDRESS=https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/${RELEASE}-${NETWORK_NAME,,}/era.addr
     export ERA_READER_VKEY=https://raw.githubusercontent.com/input-output-hk/mithril/main/mithril-infra/configuration/${RELEASE}-${NETWORK_NAME,,}/era.vkey
@@ -169,6 +176,10 @@ while getopts :duh opt; do
       usage
       exit 1
       ;;
+    *)
+      usage
+      exit 1
+      ;;
   esac
 done
 

scripts/cnode-helper-scripts/mithril-relay.sh

@@ -208,6 +208,10 @@ while getopts :dlh opt; do
       usage
       exit 1
       ;;
+    *)
+      usage
+      exit 1
+      ;;
     esac
 done
 

scripts/cnode-helper-scripts/mithril-signer.sh

@@ -16,6 +16,9 @@
 # Do NOT modify code below           #
 ######################################
 
+U_ID=$(id -u)
+G_ID=$(id -g)
+
 #####################
 # Functions         #
 #####################
@@ -71,6 +74,10 @@ get_relay_endpoint() {
 }
 
 generate_environment_file() {
+  if [[ ! -d "${CNODE_HOME}/mithril/data-stores" ]]; then
+    sudo mkdir -p "${CNODE_HOME}"/mithril/data-stores
+    sudo chown -R "$U_ID":"$G_ID" "${CNODE_HOME}"/mithril 2>/dev/null
+  fi
   # Inquire about the relay endpoint
   read -r -p "Are you using a relay endpoint? (y/n, press Enter to use default y): " ENABLE_RELAY_ENDPOINT
   ENABLE_RELAY_ENDPOINT=${ENABLE_RELAY_ENDPOINT:-y}