fix(release): make dev installer canary ready

Author: drew

install-dev.sh

@@ -52,7 +52,8 @@ NOTES:
     This installs the selected release from:
     ${GITHUB_URL}/releases/tag/${RELEASE_TAG}
 
-    Linux installs the Debian package on amd64 and arm64.
+    Linux installs the Debian package on Debian/Ubuntu, or RPM packages on
+    Fedora/RHEL, for amd64/x86_64 and arm64/aarch64.
     macOS installs the release Homebrew formula on Apple Silicon and starts a
     brew services-backed local gateway.
 EOF
@@ -186,8 +187,18 @@ detect_platform() {
   esac
 }
 
-check_linux_platform() {
-  require_cmd dpkg
+detect_linux_package_format() {
+  if has_cmd dpkg; then
+    echo "deb"
+    return 0
+  fi
+
+  if has_cmd rpm; then
+    echo "rpm"
+    return 0
+  fi
+
+  error "Linux dev installs require either 'dpkg' or 'rpm'"
 }
 
 check_macos_platform() {
@@ -227,7 +238,46 @@ find_deb_asset() {
   _arch="$2"
 
   awk -v arch="$_arch" '
-    $2 ~ "^\\*?openshell_.*_" arch "\\.deb$" {
+    $2 ~ "^\\*?openshell[-_].*[-_]" arch "\\.deb$" {
+      sub("^\\*", "", $2)
+      print $2
+      exit
+    }
+  ' "$_checksums"
+}
+
+get_rpm_arch() {
+  _arch=""
+  if has_cmd rpm; then
+    _arch="$(rpm --eval '%{_arch}' 2>/dev/null || true)"
+  fi
+  if [ -z "$_arch" ]; then
+    _arch="$(uname -m)"
+  fi
+
+  case "$_arch" in
+    x86_64|aarch64)
+      echo "$_arch"
+      ;;
+    amd64)
+      echo "x86_64"
+      ;;
+    arm64)
+      echo "aarch64"
+      ;;
+    *)
+      error "no dev RPM package is published for architecture: ${_arch}"
+      ;;
+  esac
+}
+
+find_rpm_asset() {
+  _checksums="$1"
+  _prefix="$2"
+  _arch="$3"
+
+  awk -v prefix="$_prefix" -v arch="$_arch" '
+    $2 ~ "^\\*?" prefix ".*-" arch "\\.rpm$" {
       sub("^\\*", "", $2)
       print $2
       exit
@@ -271,6 +321,61 @@ install_deb_package() {
   fi
 }
 
+install_rpm_packages() {
+  if has_cmd dnf; then
+    as_root dnf install -y "$@"
+  elif has_cmd yum; then
+    as_root yum install -y "$@"
+  elif has_cmd rpm; then
+    as_root rpm -Uvh --replacepkgs "$@"
+  else
+    error "neither 'dnf', 'yum', nor 'rpm' found; cannot install RPM packages"
+  fi
+}
+
+ensure_local_gateway_env() {
+  _config_dir="${TARGET_HOME}/.config/openshell"
+  _env_file="${_config_dir}/gateway.env"
+
+  # shellcheck disable=SC2016
+  as_target_user sh -c '
+    env_file=$1
+    port=$2
+
+    mkdir -p "$(dirname "$env_file")"
+    touch "$env_file"
+    chmod 600 "$env_file"
+
+    add_var() {
+      key=$1
+      value=$2
+      if ! grep -Eq "^[[:space:]]*${key}=" "$env_file"; then
+        printf "%s=%s\n" "$key" "$value" >>"$env_file"
+      fi
+    }
+
+    if ! grep -Eq "^[[:space:]]*OPENSHELL_SSH_HANDSHAKE_SECRET=" "$env_file"; then
+      if command -v openssl >/dev/null 2>&1; then
+        secret="$(openssl rand -hex 32)"
+      elif command -v od >/dev/null 2>&1; then
+        secret="$(od -An -tx1 -N32 /dev/urandom | tr -d " \n")"
+      else
+        echo "openshell: error: openssl or od is required to generate OPENSHELL_SSH_HANDSHAKE_SECRET" >&2
+        exit 1
+      fi
+      printf "%s=%s\n" OPENSHELL_SSH_HANDSHAKE_SECRET "$secret" >>"$env_file"
+    fi
+
+    add_var OPENSHELL_BIND_ADDRESS 127.0.0.1
+    add_var OPENSHELL_SERVER_PORT "$port"
+    add_var OPENSHELL_DISABLE_TLS true
+    add_var OPENSHELL_DISABLE_GATEWAY_AUTH true
+    add_var OPENSHELL_GRPC_ENDPOINT "http://127.0.0.1:${port}"
+    add_var OPENSHELL_SSH_GATEWAY_HOST 127.0.0.1
+    add_var OPENSHELL_SSH_GATEWAY_PORT "$port"
+  ' sh "$_env_file" "$LOCAL_GATEWAY_PORT"
+}
+
 homebrew_formula_path() {
   _tap="$1"
   _formula="$2"
@@ -303,9 +408,11 @@ start_user_gateway() {
   info "restarting openshell-gateway user service as ${TARGET_USER}..."
 
   if ! as_target_user systemctl --user daemon-reload; then
-    info "could not reach the user systemd manager for ${TARGET_USER}"
-    info "restart the gateway later with: systemctl --user enable openshell-gateway && systemctl --user restart openshell-gateway"
-    info "then register it with: openshell gateway add http://127.0.0.1:17670 --local --name local"
+    warn "could not reach the user systemd manager for ${TARGET_USER}"
+    start_direct_gateway
+    info "registering local gateway as ${TARGET_USER}..."
+    register_local_gateway
+    wait_for_registered_gateway
     return 0
   fi
 
@@ -315,6 +422,73 @@ start_user_gateway() {
 
   info "registering local gateway as ${TARGET_USER}..."
   register_local_gateway
+  wait_for_registered_gateway
+}
+
+start_direct_gateway() {
+  _gateway_bin="${OPENSHELL_GATEWAY_BIN:-openshell-gateway}"
+  _config_dir="${TARGET_HOME}/.config/openshell"
+  _env_file="${_config_dir}/gateway.env"
+  _state_home="${XDG_STATE_HOME:-${TARGET_HOME}/.local/state}"
+  _state_dir="${_state_home}/openshell/gateway"
+  _pid_file="${_state_dir}/openshell-gateway.pid"
+  _log_file="${_state_dir}/openshell-gateway.log"
+
+  info "starting openshell-gateway directly as ${TARGET_USER}..."
+
+  # shellcheck disable=SC2016
+  as_target_user sh -c '
+    gateway_bin=$1
+    env_file=$2
+    state_dir=$3
+    pid_file=$4
+    log_file=$5
+    port=$6
+
+    if [ -f "$pid_file" ] && kill -0 "$(cat "$pid_file")" 2>/dev/null; then
+      exit 0
+    fi
+
+    mkdir -p "$state_dir"
+
+    export OPENSHELL_BIND_ADDRESS="${OPENSHELL_BIND_ADDRESS:-127.0.0.1}"
+    export OPENSHELL_SERVER_PORT="${OPENSHELL_SERVER_PORT:-$port}"
+    export OPENSHELL_DISABLE_TLS="${OPENSHELL_DISABLE_TLS:-true}"
+    export OPENSHELL_DISABLE_GATEWAY_AUTH="${OPENSHELL_DISABLE_GATEWAY_AUTH:-true}"
+    export OPENSHELL_DB_URL="${OPENSHELL_DB_URL:-sqlite:${state_dir}/openshell.db?mode=rwc}"
+    export OPENSHELL_GRPC_ENDPOINT="${OPENSHELL_GRPC_ENDPOINT:-http://127.0.0.1:${port}}"
+    export OPENSHELL_SSH_GATEWAY_HOST="${OPENSHELL_SSH_GATEWAY_HOST:-127.0.0.1}"
+    export OPENSHELL_SSH_GATEWAY_PORT="${OPENSHELL_SSH_GATEWAY_PORT:-$port}"
+
+    if [ -f "$env_file" ]; then
+      set -a
+      . "$env_file"
+      set +a
+    fi
+
+    nohup "$gateway_bin" >"$log_file" 2>&1 &
+    printf "%s\n" "$!" >"$pid_file"
+  ' sh "$_gateway_bin" "$_env_file" "$_state_dir" "$_pid_file" "$_log_file" "$LOCAL_GATEWAY_PORT"
+}
+
+wait_for_registered_gateway() {
+  _status_bin="${OPENSHELL_REGISTER_BIN:-openshell}"
+  _timeout="${OPENSHELL_INSTALL_GATEWAY_TIMEOUT:-30}"
+  _elapsed=0
+  _last_output=""
+
+  info "waiting for local gateway to become reachable..."
+  while [ "$_elapsed" -lt "$_timeout" ]; do
+    if _last_output="$(as_target_user "$_status_bin" status 2>&1)"; then
+      info "local gateway is reachable"
+      return 0
+    fi
+    sleep 1
+    _elapsed=$((_elapsed + 1))
+  done
+
+  printf '%s\n' "$_last_output" >&2
+  error "local gateway did not become reachable within ${_timeout}s"
 }
 
 remove_local_gateway_registration() {
@@ -358,8 +532,6 @@ register_local_gateway() {
 }
 
 install_linux_deb() {
-  check_linux_platform
-
   if [ "$(id -u)" -eq "$TARGET_UID" ] && [ -n "${XDG_RUNTIME_DIR:-}" ]; then
     TARGET_RUNTIME_DIR="$XDG_RUNTIME_DIR"
   else
@@ -399,6 +571,56 @@ install_linux_deb() {
   info "installing ${_deb_file}..."
   install_deb_package "$_deb_path"
   info "installed ${APP_NAME} package from ${RELEASE_TAG}"
+  ensure_local_gateway_env
+  start_user_gateway
+}
+
+install_linux_rpm() {
+  if [ "$(id -u)" -eq "$TARGET_UID" ] && [ -n "${XDG_RUNTIME_DIR:-}" ]; then
+    TARGET_RUNTIME_DIR="$XDG_RUNTIME_DIR"
+  else
+    TARGET_RUNTIME_DIR="/run/user/${TARGET_UID}"
+  fi
+
+  _arch="$(get_rpm_arch)"
+  _tmpdir="$(mktemp -d)"
+  chmod 0755 "$_tmpdir"
+  trap 'rm -rf "$_tmpdir"' EXIT
+
+  _checksums_url="${GITHUB_URL}/releases/download/${RELEASE_TAG}/${CHECKSUMS_NAME}"
+  info "downloading ${RELEASE_TAG} release checksums..."
+  download "$_checksums_url" "${_tmpdir}/${CHECKSUMS_NAME}" || {
+    error "failed to download ${_checksums_url}"
+  }
+
+  _cli_rpm_file="$(find_rpm_asset "${_tmpdir}/${CHECKSUMS_NAME}" "openshell-dev" "$_arch")"
+  if [ -z "$_cli_rpm_file" ]; then
+    error "no dev CLI RPM package found for architecture: ${_arch}"
+  fi
+
+  _gateway_rpm_file="$(find_rpm_asset "${_tmpdir}/${CHECKSUMS_NAME}" "openshell-gateway-dev" "$_arch")"
+  if [ -z "$_gateway_rpm_file" ]; then
+    error "no dev gateway RPM package found for architecture: ${_arch}"
+  fi
+
+  info "selected ${_cli_rpm_file} and ${_gateway_rpm_file}"
+
+  for _rpm_file in "$_cli_rpm_file" "$_gateway_rpm_file"; do
+    _rpm_path="${_tmpdir}/${_rpm_file}"
+    info "downloading ${_rpm_file}..."
+    download_release_asset "$RELEASE_TAG" "$_rpm_file" "$_rpm_path" || {
+      error "failed to download ${GITHUB_URL}/releases/download/${RELEASE_TAG}/${_rpm_file}"
+    }
+    chmod 0644 "$_rpm_path"
+
+    info "verifying checksum for ${_rpm_file}..."
+    verify_checksum "$_rpm_path" "${_tmpdir}/${CHECKSUMS_NAME}" "$_rpm_file"
+  done
+
+  info "installing ${_cli_rpm_file} and ${_gateway_rpm_file}..."
+  install_rpm_packages "${_tmpdir}/${_cli_rpm_file}" "${_tmpdir}/${_gateway_rpm_file}"
+  info "installed ${APP_NAME} RPM packages from ${RELEASE_TAG}"
+  ensure_local_gateway_env
   start_user_gateway
 }
 
@@ -477,7 +699,14 @@ main() {
 
   case "$PLATFORM" in
     linux)
-      install_linux_deb
+      case "$(detect_linux_package_format)" in
+        deb)
+          install_linux_deb
+          ;;
+        rpm)
+          install_linux_rpm
+          ;;
+      esac
       ;;
     darwin)
       install_macos_homebrew

openshell.spec

@@ -151,7 +151,6 @@ ExecStartPre=%{_libexecdir}/openshell/init-pki.sh %%S/openshell/tls
 # reference) on first start if not present.
 # %%E expands to $XDG_CONFIG_HOME (~/.config) in user units.
 ExecStartPre=%{_libexecdir}/openshell/init-gateway-env.sh %%E/openshell/gateway.env
-EnvironmentFile=-%%E/openshell/gateway.env
 Environment=OPENSHELL_BIND_ADDRESS=0.0.0.0
 Environment=OPENSHELL_DRIVERS=podman
 Environment=OPENSHELL_DB_URL=sqlite://%%S/openshell/gateway.db
@@ -165,6 +164,7 @@ Environment=OPENSHELL_TLS_CLIENT_CA=%%S/openshell/tls/ca.crt
 Environment=OPENSHELL_PODMAN_TLS_CA=%%S/openshell/tls/ca.crt
 Environment=OPENSHELL_PODMAN_TLS_CERT=%%S/openshell/tls/client/tls.crt
 Environment=OPENSHELL_PODMAN_TLS_KEY=%%S/openshell/tls/client/tls.key
+EnvironmentFile=-%%E/openshell/gateway.env
 ExecStart=/usr/bin/openshell-gateway
 StateDirectory=openshell
 Restart=on-failure