Merge 986bcaaa0d into f428146c47

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/validate-filenames.yml

@@ -16,6 +16,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -30,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{ fromJSON(steps.pr.outputs.result).merge_commit_sha }}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
 
       - name: Get changed files
         id: changed-files
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then
+          if ${{ github.event_name == 'pull_request_target' }}; then
-              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
           fi
@@ -88,7 +89,7 @@ jobs:
           fi
 
       - name: Post results and comment
-        if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request'
+        if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         with:
           script: |

.github/workflows/validate-formatting.yaml

@@ -18,6 +18,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -32,13 +33,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{ fromJSON(steps.pr.outputs.result).merge_commit_sha }}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
 
       - name: Get changed files
         id: changed-files
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then
+          if ${{ github.event_name == 'pull_request_target' }}; then
-              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           fi
@@ -69,7 +70,7 @@ jobs:
           fi
 
       - name: Post comment with results
-        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request'
+        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         with:
           script: |

.github/workflows/validate-scripts.yml

@@ -17,6 +17,7 @@ jobs:
 
     steps:
       - name: Get pull request information
+        if: github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         id: pr
         with:
@@ -31,17 +32,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
-          ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}}
+          ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
-          
-      - name: Set execute permission for .sh files
-        run: |
-          chmod +x ct/*.sh
 
       - name: Get changed files
         id: changed-files
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then
+          if ${{ github.event_name == 'pull_request_target' }}; then
-              echo "files=$(git diff --name-only -r HEAD^1 HEAD | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
+              echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
           else
               echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
           fi
@@ -167,7 +164,7 @@ jobs:
           fi
 
       - name: Post results and comment
-        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request'
+        if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request_target'
         uses: actions/github-script@v7
         with:
           script: |

CHANGELOG.md

@@ -24,6 +24,11 @@ Do not break established syntax in this file, as it is automatically updated by
 
 - update postgresql json to add post install password setup [@rdiazlugo](https://github.com/rdiazlugo) ([#1318](https://github.com/community-scripts/ProxmoxVE/pull/1318))
 
+### 🧰 Maintenance
+
+- fix(ci): formatting event & chmod +x [@se-bastiaan](https://github.com/se-bastiaan) ([#1335](https://github.com/community-scripts/ProxmoxVE/pull/1335))
+- fix: correctly handle pull_request_target event [@se-bastiaan](https://github.com/se-bastiaan) ([#1327](https://github.com/community-scripts/ProxmoxVE/pull/1327))
+
 ## 2025-01-07
 
 ### Changed

ct/calibre-server.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+# Copyright (c) 2021-2024
+# Author: thisisjeron
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://calibre-ebook.com
+
+# App Default Values
+APP="Calibre-Server"
+var_tags="eBook"
+var_cpu="2"
+var_ram="1024"
+var_disk="4"
+var_os="debian"
+var_version="12"
+var_unprivileged="1"
+
+# App Output & Base Settings
+header_info "$APP"
+base_settings
+
+# Core
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  # Check if installed
+  if [[ ! -f /etc/systemd/system/calibre-server.service ]]; then
+    msg_error "No ${APP} Installation Found!"
+    exit
+  fi
+
+  msg_info "Stopping ${APP}"
+  systemctl stop calibre-server
+  msg_ok "Stopped ${APP}"
+
+  msg_info "Updating ${APP} container packages"
+  apt-get update &>/dev/null
+  apt-get -y upgrade &>/dev/null
+  msg_ok "Container packages updated"
+
+  # Potentially re-run the official calibre script to ensure most recent version
+  # to keep logic consistent with how other scripts handle updates.
+  msg_info "Updating Calibre (latest)"
+  wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin &>/dev/null
+  msg_ok "Updated Calibre"
+
+  msg_info "Starting ${APP}"
+  systemctl start calibre-server
+  msg_ok "Started ${APP}"
+  msg_ok "Updated Successfully"
+  exit
+}
+
+start
+build_container
+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}:8180${CL}" 

install/calibre-server-install.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024
+# Author: thisisjeron
+# License: MIT
+# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y imagemagick xvfb libxcomposite1
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Calibre (latest)"
+# If your container runs as root, you generally do not need to prefix with `sudo`.
+# The official Calibre instructions:
+wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sh /dev/stdin
+msg_ok "Installed Calibre"
+
+msg_info "Creating calibre system user & directories"
+useradd -c "Calibre Server" -d /opt/calibre -s /bin/bash -m calibre
+mkdir -p /opt/calibre/calibre-library
+chown -R calibre:calibre /opt/calibre
+msg_ok "Created calibre user & directories"
+
+msg_info "Creating systemd service"
+cat <<EOF >/etc/systemd/system/calibre-server.service
+[Unit]
+Description=Calibre Content Server
+After=network.target
+
+[Service]
+Type=simple
+User=calibre
+Group=calibre
+ExecStart=/opt/calibre/calibre-server --port=8180 --enable-local-write /opt/calibre/calibre-library
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now calibre-server.service
+msg_ok "Created Service"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"
+ 

json/calibre-server.json

@@ -0,0 +1,43 @@
+{
+    "name": "Calibre-Server",
+    "slug": "calibre-server",
+    "categories": [
+      12
+    ],
+    "date_created": "2024-05-02",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 8180,
+    "documentation": null,
+    "website": "https://calibre-ebook.com",
+    "logo": "https://calibre-ebook.com/resources/icons/calibre_icon.png",
+    "description": "Calibre content server is usedto manage and serve eBooks over the network.",
+    "install_methods": [
+      {
+        "type": "default",
+        "script": "ct/calibre-server.sh",
+        "resources": {
+          "cpu": 2,
+          "ram": 1024,
+          "hdd": 4,
+          "os": "debian",
+          "version": "12"
+        }
+      }
+    ],
+    "default_credentials": {
+      "username": null,
+      "password": null
+    },
+    "notes": [
+      {
+        "text": "By default, the Calibre Server runs on port 8180 with no username/password.",
+        "type": "info"
+      },
+      {
+        "text": "Use 'calibredb add' from the calibre user or run 'xvfb-run calibredb add ...' if you need to add books while the server is running.",
+        "type": "info"
+      }
+    ]
+  }