Merge branch 'community-scripts:main' into main

2025-01-10 19:05:09 +00:00 · 2025-01-03 21:32:50 +01:00 · 2025-01-03 21:32:50 +01:00 · 399484f3ee
commit 399484f3ee
parent 664f28a4cb 036728df0d
8 changed files with 118 additions and 17 deletions
--- a/.github/workflows/check-metadata.yml
+++ b/.github/workflows/check-metadata.yml
@ -0,0 +1,55 @@
+name: Check Metadata
+on:
+  pull_request:
+    paths:
+      - '/ct/*.sh'
+      - '/install/*.sh'
+jobs:
+  check-metadata:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Check Metadata Lines in Scripts
+        shell: bash
+        run: |
+          set -e
+          ERROR_COUNT=0
+          FILES=$(find . -name "*.sh")
+
+          for FILE in $FILES; do
+            if [[ "$(sed -n '3p' "$FILE")" == "# Copyright (c) 2021-2024 community-scripts ORG" ]]; then
+                echo "Check for Copyright metadata passed for line 3 in: $FILE"
+            else
+                echo "Error in $FILE: Copyright metadata missing or not on line 3"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+            
+            if sed -n '4p' "$FILE" | grep -qE "^# Author: .+"; then
+                echo "Check for Author metadata passed for line 4 in: $FILE"
+            else
+                echo "Error in $FILE: Author metadata missing or invalid on line 4"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+
+            if [[ "$(sed -n '5p' "$FILE")" == "# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE" ]]; then
+                echo "Check for License metadata passed for line 5 in: $FILE"
+            else
+                echo "Error in $FILE: License metadata missing or not on line 5"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+
+            if sed -n '6p' "$FILE" | grep -qE "^# Source: .+"; then
+                echo "Check for Source metadata passed for line 6 in: $FILE"
+            else
+                echo "Error in $FILE: Source metadata missing or invalid on line 6"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+          done
+
+          if [[ "$ERROR_COUNT" -gt 0 ]]; then
+              echo "$ERROR_COUNT script(s) failed validation."
+              exit 1
+          else
+              echo "All scripts passed."
+          fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,26 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow

+## 2025-01-03
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Improve Homarr Installation [@MickLesk](https://github.com/MickLesk) ([#1208](https://github.com/community-scripts/ProxmoxVE/pull/1208))
+- Fix: Zabbix-Update Script [@MickLesk](https://github.com/MickLesk) ([#1205](https://github.com/community-scripts/ProxmoxVE/pull/1205))
+- Update Script: Lazylibrarian [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1190](https://github.com/community-scripts/ProxmoxVE/pull/1190))
+- Fix: Memos update function [@MickLesk](https://github.com/MickLesk) ([#1207](https://github.com/community-scripts/ProxmoxVE/pull/1207))
+- Keep Lubelogger data after update to a new version [@JcMinarro](https://github.com/JcMinarro) ([#1200](https://github.com/community-scripts/ProxmoxVE/pull/1200))
+
+### 🌐 Website
+
+- Update Nextcloud-LXC JSON [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1191](https://github.com/community-scripts/ProxmoxVE/pull/1191))
+
+### 🧰 Maintenance
+
+- Github action to check metadata lines in scripts. [@quantumryuu](https://github.com/quantumryuu) ([#1110](https://github.com/community-scripts/ProxmoxVE/pull/1110))
+
 ## 2025-01-02

 ### Changed
--- a/ct/lubelogger.sh
+++ b/ct/lubelogger.sh
@ -42,11 +42,19 @@ function update_script() {
    msg_info "Updating ${APP} to v${RELEASE}"
    cd /opt
    wget -q https://github.com/hargata/lubelog/releases/download/v${RELEASE}/LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip
-    cp /opt/lubelogger/appsettings.json /opt/appsettings.json
+    mkdir -p /tmp/lubeloggerData/wwwroot
+    cp /opt/lubelogger/appsettings.json /tmp/lubeloggerData/appsettings.json
+    cp -r /opt/lubelogger/config /tmp/lubeloggerData/
+    cp -r /opt/lubelogger/data /tmp/lubeloggerData/
+    [[ -e /opt/lubelogger/wwwroot/translations ]] && cp -r /opt/lubelogger/wwwroot/translations /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/documents ]] && cp -r /opt/lubelogger/wwwroot/documents /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/images ]] && cp -r /opt/lubelogger/wwwroot/images /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/temp ]] && cp -r /opt/lubelogger/wwwroot/temp /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/log ]] && cp -r /opt/lubelogger/log /tmp/lubeloggerData/
    rm -rf /opt/lubelogger
    unzip -qq LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip -d lubelogger
    chmod 700 /opt/lubelogger/CarCareTracker
-    mv -f /opt/appsettings.json /opt/lubelogger/appsettings.json
+    cp -rf /tmp/lubeloggerData/* /opt/lubelogger/
    echo "${RELEASE}" >"/opt/${APP}_version.txt"
    msg_ok "Updated ${APP} to v${RELEASE}"

@ -56,6 +64,7 @@ function update_script() {

    msg_info "Cleaning up"
    rm -rf /opt/LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip
+    rm -rf /tmp/lubeloggerData
    msg_ok "Cleaned"
    msg_ok "Updated Successfully"
  else
@ -71,4 +80,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}:5000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"
--- a/ct/memos.sh
+++ b/ct/memos.sh
@ -34,6 +34,7 @@ function update_script() {
  fi
  msg_info "Updating $APP (Patience)"
  cd /opt/memos
+  git reset --hard HEAD
  output=$(git pull --no-rebase)
  if echo "$output" | grep -q "Already up to date."; then
    msg_ok "$APP is already up to date."
@ -60,4 +61,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}:9030${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9030${CL}"
--- a/ct/zabbix.sh
+++ b/ct/zabbix.sh
@ -41,7 +41,7 @@ function update_script() {
    cp /etc/zabbix/zabbix_server.conf /opt/zabbix-backup/
    cp /etc/apache2/conf-enabled/zabbix.conf /opt/zabbix-backup/
    cp -R /usr/share/zabbix/ /opt/zabbix-backup/
-    cp -R /usr/share/zabbix-* /opt/zabbix-backup/
+    #cp -R /usr/share/zabbix-* /opt/zabbix-backup/ Remove temporary
    rm -Rf /etc/apt/sources.list.d/zabbix.list
    cd /tmp
    wget -q https://repo.zabbix.com/zabbix/7.2/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian12_all.deb
--- a/install/homarr-install.sh
+++ b/install/homarr-install.sh
@ -16,11 +16,14 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  sudo \
+  mc \
+  ca-certificates \
+  gnupg \
+  make \
+  g++ \
+  build-essentials
 msg_ok "Installed Dependencies"

 msg_info "Setting up Node.js Repository"
--- a/install/lazylibrarian-install.sh
+++ b/install/lazylibrarian-install.sh
@ -15,15 +15,21 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
+$STD apt-get install -y \
+    curl \
+    sudo \
+    mc \
+    git \
+    libpng-dev \
+    libjpeg-dev \
+    libtiff-dev \
+    imagemagick
 msg_ok "Installed Dependencies"

 msg_info "Installing Python3 Dependencies"
-$STD apt-get install -y pip
-$STD apt-get install -y python3-irc
+$STD apt-get install -y \
+    pip \
+    python3-irc
 $STD pip install jaraco.stream
 $STD pip install python-Levenshtein
 $STD pip install soupsieve
@ -31,6 +37,8 @@ msg_ok "Installed Python3 Dependencies"

 msg_info "Installing LazyLibrarian"
 $STD git clone https://gitlab.com/LazyLibrarian/LazyLibrarian /opt/LazyLibrarian
+cd /opt/LazyLibrarian
+$STD pip install .
 msg_ok "Installed LazyLibrarian"

 msg_info "Creating Service"
--- a/json/nextcloudpi.json
+++ b/json/nextcloudpi.json
@ -41,5 +41,10 @@
        "username": null,
        "password": null
    },
-    "notes": []
+    "notes": [
+        {
+            "text": "Only Alpine: To get the username and password, run the script again inside the LXC shell.",
+            "type": "warning"
+        }
+    ]
 }