From ad0166a8b3e670154e13f975acf08bfd7b6a678f Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Thu, 15 May 2025 08:48:32 +0200
Subject: [PATCH] fixes and add ruby.-func

---
 install/manyfold-install.sh | 65 ++++++++++++++-----------------
 misc/tools.func             | 78 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/install/manyfold-install.sh b/install/manyfold-install.sh
index 5bb5ff6..cb2b01a 100644
--- a/install/manyfold-install.sh
+++ b/install/manyfold-install.sh
@@ -4,7 +4,7 @@
 # Author: bvdberg01
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
-source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
 verb_ip6
 catch_errors
@@ -17,8 +17,7 @@ $STD apt-get install -y \
   curl \
   sudo \
   mc \
-  gnupg2\
-  postgresql \
+  gnupg2 postgresql \
   lsb-release \
   rbenv \
   libpq-dev \
@@ -38,50 +37,43 @@ DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)
 $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';"
 $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMPLATE template0;"
 {
-echo "Manyfold Credentials"
-echo "Manyfold Database User: $DB_USER"
-echo "Manyfold Database Password: $DB_PASS"
-echo "Manyfold Database Name: $DB_NAME"
-} >> ~/manyfold.creds
+  echo "Manyfold Credentials"
+  echo "Manyfold Database User: $DB_USER"
+  echo "Manyfold Database Password: $DB_PASS"
+  echo "Manyfold Database Name: $DB_NAME"
+} >>~/manyfold.creds
 msg_ok "Set up PostgreSQL"
 
 msg_info "Downloading Manyfold"
-RELEASE=$(curl -s https://api.github.com/repos/manyfold3d/manyfold/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+RELEASE=$(curl -fsSL https://api.github.com/repos/manyfold3d/manyfold/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 cd /opt
 curl -fsSL "https://github.com/manyfold3d/manyfold/archive/refs/tags/v${RELEASE}.zip" -o manyfold.zip
 unzip -q manyfold.zip
 mv /opt/manyfold-${RELEASE}/ /opt/manyfold
-RUBY_VERSION=$(cat /opt/manyfold/.ruby-version)
+RUBY_INSTALL_VERSION=$(cat /opt/manyfold/.ruby-version)
 YARN_VERSION=$(grep '"packageManager":' /opt/manyfold/package.json | sed -E 's/.*"(yarn@[0-9\.]+)".*/\1/')
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+
 msg_ok "Downloaded Manyfold"
 
-msg_info "Setting up Node.js/Yarn"
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
-$STD apt-get update
-$STD apt-get install -y nodejs
-$STD npm install -g npm@latest
-$STD npm install -g yarn
-msg_ok "Installed Node.js/Yarn"
+NODE_VERSION="22" NODE_MODULE="npm@latest,${YARN_VERSION}" install_node_and_modules
+RUBY_VERSION=${RUBY_INSTALL_VERSION} RUBY_INSTALL_RAILS="true" setup_rbenv_stack
 
-msg_info "Add ruby-build"
-mkdir -p ~/.rbenv/plugins
-cd ~/.rbenv/plugins
-RUBY_BUILD_RELEASE=$(curl -s https://api.github.com/repos/rbenv/ruby-build/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/rbenv/ruby-build/archive/refs/tags/v${RUBY_BUILD_RELEASE}.zip" -o ruby-build.zip
-unzip -q ruby-build.zip
-mv ruby-build-* ~/.rbenv/plugins/ruby-build
-echo "${RUBY_BUILD_RELEASE}" >~/.rbenv/plugins/RUBY_BUILD_version.txt
-msg_ok "Added ruby-build"
+# msg_info "Add ruby-build"
+# mkdir -p ~/.rbenv/plugins
+# cd ~/.rbenv/plugins
+# RUBY_BUILD_RELEASE=$(curl -s https://api.github.com/repos/rbenv/ruby-build/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+# curl -fsSL "https://github.com/rbenv/ruby-build/archive/refs/tags/v${RUBY_BUILD_RELEASE}.zip" -o ruby-build.zip
+# unzip -q ruby-build.zip
+# mv ruby-build-* ~/.rbenv/plugins/ruby-build
+# echo "${RUBY_BUILD_RELEASE}" >~/.rbenv/plugins/RUBY_BUILD_version.txt
+# msg_ok "Added ruby-build"
 
-msg_info "Installing ruby ${RUBY_VERSION}"
-$STD rbenv install $RUBY_VERSION
-echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
-echo 'eval "$(rbenv init -)"' >> ~/.bashrc
-source ~/.bashrc
-msg_ok "Installed ruby ${RUBY_VERSION}"
+# msg_info "Installing ruby ${RUBY_VERSION}"
+# $STD rbenv install $RUBY_VERSION
+# echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >>~/.bashrc
+# echo 'eval "$(rbenv init -)"' >>~/.bashrc
+# source ~/.bashrc
+# msg_ok "Installed ruby ${RUBY_VERSION}"
 
 msg_info "Adding manyfold user"
 useradd -m -s /usr/bin/bash manyfold
@@ -112,7 +104,7 @@ source /opt/.env
 cd /opt/manyfold
 chown -R manyfold:manyfold /opt/manyfold
 $STD gem install bundler
-$STD rbenv global $RUBY_VERSION
+$STD rbenv global $RUBY_INSTALL_VERSION
 $STD bundle install
 $STD gem install sidekiq
 $STD npm install --global corepack
@@ -124,6 +116,7 @@ rm /opt/manyfold/config/credentials.yml.enc
 $STD bin/rails credentials:edit
 $STD bin/rails db:migrate
 $STD bin/rails assets:precompile
+echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed manyfold"
 
 msg_info "Creating Service"
diff --git a/misc/tools.func b/misc/tools.func
index 9d71d02..c999070 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -99,7 +99,6 @@ install_node_and_modules() {
   fi
 }
 
-
 install_postgresql() {
   local PG_VERSION="${PG_VERSION:-16}"
   local CURRENT_PG_VERSION=""
@@ -917,3 +916,80 @@ function setup_gs() {
     msg_error "Ghostscript installation failed"
   fi
 }
+
+setup_rbenv_stack() {
+  local RUBY_VERSION="${RUBY_VERSION:-3.4.4}"
+  local RUBY_INSTALL_RAILS="${RUBY_INSTALL_RAILS:-true}"
+
+  local RBENV_DIR="$HOME/.rbenv"
+  local RBENV_BIN="$RBENV_DIR/bin/rbenv"
+  local PROFILE_FILE="$HOME/.profile"
+  local TMP_DIR
+  TMP_DIR=$(mktemp -d)
+
+  $STD msg_info "Installing rbenv + ruby-build + Ruby $RUBY_VERSION"
+
+  # Fetch latest rbenv release tag from GitHub (e.g. v1.3.2 → 1.3.2)
+  local RBENV_RELEASE
+  RBENV_RELEASE=$(curl -fsSL https://api.github.com/repos/rbenv/rbenv/releases/latest | grep '"tag_name":' | cut -d '"' -f4 | sed 's/^v//')
+  if [[ -z "$RBENV_RELEASE" ]]; then
+    msg_error "Failed to fetch latest rbenv version"
+    rm -rf "$TMP_DIR"
+    return 1
+  fi
+
+  # Download and extract rbenv release
+  curl -fsSL "https://github.com/rbenv/rbenv/archive/refs/tags/v${RBENV_RELEASE}.tar.gz" -o "$TMP_DIR/rbenv.tar.gz"
+  tar -xzf "$TMP_DIR/rbenv.tar.gz" -C "$TMP_DIR"
+  mkdir -p "$RBENV_DIR"
+  cp -r "$TMP_DIR/rbenv-${RBENV_RELEASE}/." "$RBENV_DIR/"
+  cd "$RBENV_DIR" && src/configure && make -C src
+
+  # Fetch latest ruby-build plugin release tag (e.g. v20250507 → 20250507)
+  local RUBY_BUILD_RELEASE
+  RUBY_BUILD_RELEASE=$(curl -fsSL https://api.github.com/repos/rbenv/ruby-build/releases/latest | grep '"tag_name":' | cut -d '"' -f4 | sed 's/^v//')
+  if [[ -z "$RUBY_BUILD_RELEASE" ]]; then
+    msg_error "Failed to fetch latest ruby-build version"
+    rm -rf "$TMP_DIR"
+    return 1
+  fi
+
+  # Download and install ruby-build plugin
+  curl -fsSL "https://github.com/rbenv/ruby-build/archive/refs/tags/v${RUBY_BUILD_RELEASE}.tar.gz" -o "$TMP_DIR/ruby-build.tar.gz"
+  tar -xzf "$TMP_DIR/ruby-build.tar.gz" -C "$TMP_DIR"
+  mkdir -p "$RBENV_DIR/plugins/ruby-build"
+  cp -r "$TMP_DIR/ruby-build-${RUBY_BUILD_RELEASE}/." "$RBENV_DIR/plugins/ruby-build/"
+  echo "$RUBY_BUILD_RELEASE" >"$RBENV_DIR/plugins/ruby-build/RUBY_BUILD_version.txt"
+
+  # Persist rbenv init to user's profile
+  if ! grep -q 'rbenv init' "$PROFILE_FILE"; then
+    echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >>"$PROFILE_FILE"
+    echo 'eval "$(rbenv init -)"' >>"$PROFILE_FILE"
+  fi
+
+  # Activate rbenv in current shell
+  export PATH="$RBENV_DIR/bin:$PATH"
+  eval "$("$RBENV_BIN" init - bash)"
+
+  # Install Ruby version if not already present
+  if "$RBENV_BIN" versions --bare | grep -qx "$RUBY_VERSION"; then
+    msg_ok "Ruby $RUBY_VERSION already installed"
+  else
+    $STD msg_info "Installing Ruby $RUBY_VERSION"
+    $STD "$RBENV_BIN" install "$RUBY_VERSION"
+  fi
+
+  # Set Ruby version globally
+  "$RBENV_BIN" global "$RUBY_VERSION"
+  hash -r
+
+  # Optionally install Rails via gem
+  if [[ "$RUBY_INSTALL_RAILS" == "true" ]]; then
+    $STD msg_info "Installing latest Rails via gem"
+    gem install rails
+    msg_ok "Rails $(rails -v) installed"
+  fi
+
+  rm -rf "$TMP_DIR"
+  msg_ok "rbenv stack ready (Ruby $RUBY_VERSION)"
+}