From a1e3ae6b5bf212e874f68d949760fb56ce4c4c57 Mon Sep 17 00:00:00 2001 From: Bas van den Berg <74251551+bvdberg01@users.noreply.github.com> Date: Tue, 18 Mar 2025 15:16:29 +0100 Subject: [PATCH] Fix wikijs (#3232) --- ct/wikijs.sh | 67 ++++++++++++++++++++++++--------------- install/wikijs-install.sh | 21 ++++-------- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/ct/wikijs.sh b/ct/wikijs.sh index 2d845e9d2..056381f90 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -27,35 +27,50 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi - msg_info "Stopping ${APP}" - systemctl stop wikijs - msg_ok "Stopped ${APP}" + RELEASE=$(curl -s https://api.github.com/repos/Requarks/wiki/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') + if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then + msg_info "Verifying whether ${APP}' new release is v3.x+ and current install uses SQLite." + SQLITE_INSTALL=$([ -f /opt/wikijs/db.sqlite ] && echo "true" || echo "false") + if [[ "${SQLITE_INSTALL}" == "true" && "${RELEASE}" =~ ^3.* ]]; then + echo "SQLite is not supported in v3.x+, currently there is no update path availble." + exit + fi + msg_ok "There is an update path available for ${APP} to v${RELEASE}" - msg_info "Backing up Data" - rm -rf ~/data-backup - mkdir -p ~/data-backup - [ -f /opt/wikijs/db.sqlite ] && cp /opt/wikijs/db.sqlite ~/data-backup - [ -f /opt/wikijs/config.yml ] && cp /opt/wikijs/config.yml ~/data-backup - [ -d /opt/wikijs/data ] && cp -R /opt/wikijs/data ~/data-backup - msg_ok "Backed up Data" + msg_info "Stopping ${APP}" + systemctl stop wikijs + msg_ok "Stopped ${APP}" - msg_info "Updating ${APP}" - rm -rf /opt/wikijs/* - cd /opt/wikijs - wget -q https://github.com/Requarks/wiki/releases/latest/download/wiki-js.tar.gz - tar xzf wiki-js.tar.gz - msg_ok "Updated ${APP}" + msg_info "Backing up Data" + mkdir /opt/wikijs-backup + $SQLITE_INSTALL && cp /opt/wikijs/db.sqlite /opt/wikijs-backup + cp -R /opt/wikijs/{config.yml,/data} /opt/wikijs-backup + msg_ok "Backed up Data" - msg_info "Restoring Data" - cp -R ~/data-backup/* /opt/wikijs - rm -rf ~/data-backup - $STD npm rebuild sqlite3 - msg_ok "Restored Data" + msg_info "Updating ${APP}" + rm -rf /opt/wikijs/* + cd /opt/wikijs + wget -q "https://github.com/requarks/wiki/releases/download/v${RELEASE}/wiki-js.tar.gz" + tar -xzf wiki-js.tar.gz + msg_ok "Updated ${APP}" - msg_info "Starting ${APP}" - systemctl start wikijs - msg_ok "Started ${APP}" - msg_ok "Updated Successfully" + msg_info "Restoring Data" + cp -R /opt/wikijs-backup/* /opt/wikijs + $SQLITE_INSTALL && $STD npm rebuild sqlite3 + msg_ok "Restored Data" + + msg_info "Starting ${APP}" + systemctl start wikijs + msg_ok "Started ${APP}" + + msg_info "Cleaning Up" + rm -rf /opt/wikijs/wiki-js.tar.gz + rm -rf /opt/wikijs-backup + msg_ok "Cleanup Completed" + msg_ok "Updated Successfully" + else + msg_ok "No update required. ${APP} is already at v${RELEASE}" + fi exit } @@ -66,4 +81,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}" +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}" \ No newline at end of file diff --git a/install/wikijs-install.sh b/install/wikijs-install.sh index 903e74309..2c9edbe2e 100644 --- a/install/wikijs-install.sh +++ b/install/wikijs-install.sh @@ -19,12 +19,7 @@ $STD apt-get install -y \ sudo \ mc \ git \ - ca-certificates \ - gnupg \ - build-essential \ - python3 \ - g++ \ - make + gpg msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" @@ -67,16 +62,12 @@ msg_ok "Set up PostgreSQL" msg_info "Setup Wiki.js" temp_file=$(mktemp) RELEASE=$(curl -s https://api.github.com/repos/Requarks/wiki/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -wget -q "https://github.com/Requarks/wiki/archive/refs/tags/v${RELEASE}.tar.gz" -O "$temp_file" -tar -xzf "$temp_file" -mv wiki-${RELEASE} /opt/wikijs +wget -q "https://github.com/requarks/wiki/releases/download/v${RELEASE}/wiki-js.tar.gz" -O "$temp_file" +mkdir /opt/wikijs +tar -xzf "$temp_file" -C /opt/wikijs mv /opt/wikijs/config.sample.yml /opt/wikijs/config.yml sed -i -E 's|^( *user: ).*|\1'"$DB_USER"'|' /opt/wikijs/config.yml sed -i -E 's|^( *pass: ).*|\1'"$DB_PASS"'|' /opt/wikijs/config.yml -cd /opt/wikijs -export NODE_OPTIONS="--max-old-space-size=2048" -$STD yarn install --ignore-engines -$STD yarn build echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Installed Wiki.js" @@ -88,7 +79,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/bin/yarn start +ExecStart=/usr/bin/node server Restart=always User=root Environment=NODE_ENV=production @@ -107,4 +98,4 @@ msg_info "Cleaning up" rm -f "$temp_file" $STD apt-get -y autoremove $STD apt-get -y autoclean -msg_ok "Cleaned" +msg_ok "Cleaned" \ No newline at end of file