Cleaning up the code

2025-11-30 15:31:50 -05:00 · 2025-11-30 15:31:50 -05:00 · 49f6a047f2
commit 49f6a047f2
parent 8c06940d96
3 changed files with 34 additions and 34 deletions
--- a/ct/manyfold.sh
+++ b/ct/manyfold.sh
@ -37,7 +37,7 @@ function update_script() {
        msg_info "Backing up data"
        source /opt/manyfold/.env
        mv /opt/manyfold/app/storage /opt/manyfold/app/tmp /opt/manyfold/app/config/credentials.yml.enc /opt/manyfold/app/config/master.key ~/
-        tar -cvzf "/opt/manyfold_${APP_VERSION}_backup.tar.gz" /opt/manyfold/app/
+        $STD tar -cvzf "/opt/manyfold_${APP_VERSION}_backup.tar.gz" /opt/manyfold/app/
        rm -rf /opt/manyfold/app/
        msg_ok "Backed-up data"

@ -46,15 +46,14 @@ function update_script() {
        msg_info "Configuring manyfold environment"
        RUBY_INSTALL_VERSION=$(cat /opt/manyfold/app/.ruby-version)
        YARN_VERSION=$(grep '"packageManager":' /opt/manyfold/app/package.json | sed -E 's/.*"(yarn@[0-9\.]+)".*/\1/')
-        RBENV_PATH="/home/manyfold/.rbenv"
        RELEASE=$(curl -fsSL https://api.github.com/repos/manyfold3d/manyfold/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
        sed -i "s/^export APP_VERSION=.*/export APP_VERSION=$RELEASE/" "/opt/manyfold/.env"
        cat <<EOF >/opt/manyfold/user_setup.sh
 #!/bin/bash

 source /opt/manyfold/.env
-export PATH="$RBENV_PATH/bin:\$PATH"
-eval "\$($RBENV_PATH/bin/rbenv init - bash)"
+export PATH="/home/manyfold/.rbenv/bin:\$PATH"
+eval "\$(/home/manyfold/.rbenv/bin/rbenv init - bash)"
 cd /opt/manyfold/app
 rbenv global $RUBY_INSTALL_VERSION
 gem install bundler
@ -67,9 +66,6 @@ corepack use $YARN_VERSION
 bin/rails db:migrate
 bin/rails assets:precompile
 EOF
-        $STD mkdir -p /opt/manyfold/data
-        chown -R manyfold:manyfold /opt/manyfold
-        $STD chmod +x /opt/manyfold/user_setup.sh
        msg_ok "Configured manyfold environment"

        RUBY_VERSION=${RUBY_INSTALL_VERSION} RUBY_INSTALL_RAILS="true" HOME=/home/manyfold setup_ruby
@ -80,14 +76,14 @@ EOF
        mv ~/storage ~/tmp /opt/manyfold/app/
        mv ~/credentials.yml.enc ~/master.key /opt/manyfold/app/config/
        chown -R manyfold:manyfold /opt/manyfold
+        chmod +x /opt/manyfold/user_setup.sh
        $STD sudo -u manyfold bash /opt/manyfold/user_setup.sh
        rm -f /opt/manyfold/user_setup.sh
        msg_ok "Installed manyfold"

        msg_info "Restoring Service"
-        cd /opt/manyfold/app
        source /opt/manyfold/.env
-        export PATH="$RBENV_PATH//shims:$RBENV_PATH/bin:$PATH"
+        export PATH="/home/manyfold/.rbenv/shims:/home/manyfold/.rbenv/bin:$PATH"
        $STD foreman export systemd /etc/systemd/system -a manyfold -u manyfold -f /opt/manyfold/app/Procfile
        for f in /etc/systemd/system/manyfold-*.service; do
            sed -i "s|/bin/bash -lc '|/bin/bash -lc 'source /opt/manyfold/.env \&\& |" "$f"
--- a/frontend/public/json/manyfold.json
+++ b/frontend/public/json/manyfold.json
@ -12,7 +12,7 @@
    "documentation": "https://manyfold.app/sysadmin/",
    "website": "https://manyfold.app/",
    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/manyfold.webp",
-    "config_path": "",
+    "config_path": "/opt/manyfold/.env",
    "description": "Manyfold is an open source, self-hosted web application for managing a collection of 3d models, particularly focused on 3d printing.",
    "install_methods": [
        {
@ -31,5 +31,10 @@
        "username": null,
        "password": null
    },
-    "notes": []
+    "notes": [
+        {
+            "text": "Setup library on first connection in /opt/manyfold/data",
+            "type": "info"
+        }
+    ]
 }
--- a/install/manyfold-install.sh
+++ b/install/manyfold-install.sh
@ -15,28 +15,32 @@ update_os

 msg_info "Installing Dependencies"
 $STD apt-get install -y \
-    lsb-release \
-    libpq-dev \
    libarchive-dev \
    git \
    libmariadb-dev \
    redis-server \
    nginx \
-    libffi-dev \
-    libyaml-dev \
    libassimp-dev \
-    build-essential \
-    pkg-config \
-    libssl-dev \
-    libreadline-dev \
-    zlib1g-dev \
-    libgmp-dev \
    libmagickwand-dev \
-    redis \
    imagemagick \
+    build-essential \
+    libtool \
    libjpeg-dev \
+    libpng-dev \
+    libtiff-dev \
    libwebp-dev \
-    libheif-dev
+    libheif-dev \
+    libde265-dev \
+    libopenjp2-7-dev \
+    libxml2-dev \
+    liblcms2-dev \
+    libfreetype6-dev \
+    libraw-dev \
+    libfftw3-dev \
+    liblqr-1-0-dev \
+    libgsl-dev \
+    pkg-config \
+    ghostscript
 msg_ok "Installed Dependencies"

 PG_VERSION="16" setup_postgresql
@ -46,8 +50,7 @@ fetch_and_deploy_gh_release "manyfold" "manyfold3d/manyfold" "tarball" "latest"
 msg_info "Configuring manyfold environment"
 RUBY_INSTALL_VERSION=$(cat /opt/manyfold/app/.ruby-version)
 YARN_VERSION=$(grep '"packageManager":' /opt/manyfold/app/package.json | sed -E 's/.*"(yarn@[0-9\.]+)".*/\1/')
-RBENV_PATH="/home/manyfold/.rbenv"
-PATH="$RBENV_PATH/bin:$PATH"
+RELEASE=$(curl -fsSL https://api.github.com/repos/manyfold3d/manyfold/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 DB_NAME=manyfold
 DB_USER=manyfold
 DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)
@ -57,9 +60,6 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8'
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC';"
 useradd -m -s /usr/bin/bash manyfold
-echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >>/home/manyfold/.bashrc
-echo 'eval "$(rbenv init -)"' >>/home/manyfold/.bashrc
-RELEASE=$(curl -fsSL https://api.github.com/repos/manyfold3d/manyfold/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 cat <<EOF >/opt/manyfold/.env
 export APP_VERSION=${RELEASE}
 export GUID=1002
@ -80,8 +80,8 @@ cat <<EOF >/opt/manyfold/user_setup.sh
 #!/bin/bash

 source /opt/manyfold/.env
-export PATH="$RBENV_PATH/bin:\$PATH"
-eval "\$($RBENV_PATH/bin/rbenv init - bash)"
+export PATH="/home/manyfold/.rbenv/bin:\$PATH"
+eval "\$(/home/manyfold/.rbenv/bin/rbenv init - bash)"
 cd /opt/manyfold/app
 rbenv global $RUBY_INSTALL_VERSION
 gem install bundler
@ -98,8 +98,6 @@ bin/rails db:migrate
 bin/rails assets:precompile
 EOF
 $STD mkdir -p /opt/manyfold/data
-chown -R manyfold:manyfold /opt/manyfold
-$STD chmod +x /opt/manyfold/user_setup.sh
 msg_ok "Configured manyfold environment"

 NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
@ -107,15 +105,16 @@ RUBY_VERSION=${RUBY_INSTALL_VERSION} RUBY_INSTALL_RAILS="true" HOME=/home/manyfo

 msg_info "Installing Manyfold"
 chown -R manyfold:manyfold /home/manyfold/.rbenv
+chown -R manyfold:manyfold /opt/manyfold
+chmod +x /opt/manyfold/user_setup.sh
 npm install --global corepack
 $STD sudo -u manyfold bash /opt/manyfold/user_setup.sh
 rm -f /opt/manyfold/user_setup.sh
 msg_ok "Installed manyfold"

 msg_info "Creating Services"
-cd /opt/manyfold/app
 source /opt/manyfold/.env
-eval "$($RBENV_PATH/bin/rbenv init - bash)"
+export PATH="/home/manyfold/.rbenv/shims:/home/manyfold/.rbenv/bin:$PATH"
 $STD foreman export systemd /etc/systemd/system -a manyfold -u manyfold -f /opt/manyfold/app/Procfile
 for f in /etc/systemd/system/manyfold-*.service; do
    sed -i "s|/bin/bash -lc '|/bin/bash -lc 'source /opt/manyfold/.env \&\& |" "$f"