Merge d242578c35 into f428146c47

.github/workflows/validate-formatting.yaml

@@ -38,7 +38,7 @@ jobs:
       - 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 }} ${{ 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
@@ -70,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

@@ -33,10 +33,6 @@ jobs:
         with:
           fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
           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

CHANGELOG.md

@@ -26,6 +26,7 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### 🧰 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

install/alpine-docker-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
 $STD apk add tzdata
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Docker"

install/alpine-grafana-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Grafana"
 $STD apk add grafana

install/alpine-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/alpine-nextcloud-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add nginx
 msg_ok "Installed Dependencies"
 

install/alpine-vaultwarden-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add argon2
 msg_ok "Installed Dependencies"
 

install/alpine-zigbee2mqtt-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt

install/debian-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/ubuntu-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

misc/alpine-install.func

@@ -133,6 +133,14 @@ update_os() {
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update install.func for apt-based systems as appropriate.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  $STD apk add curl mc nano newt openssh sudo
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode

misc/install.func

@@ -197,6 +197,15 @@ EOF
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update alpine-install.func to match for apk-based systems when
+# adding a new package.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  $STD apt-get install curl mc sudo
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode