From 31752782ba6a28be457d3e8da33db2f52c91812b Mon Sep 17 00:00:00 2001
From: Kristo Copani <31226503+quantumryuu@users.noreply.github.com>
Date: Thu, 26 Dec 2024 13:16:06 +0200
Subject: [PATCH] fix and migrate to new format

---
 ct/jenkins.sh              | 64 +++++++++++---------------------------
 install/jenkins-install.sh | 11 +++----
 2 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/ct/jenkins.sh b/ct/jenkins.sh
index 056d3d20..5188606d 100644
--- a/ct/jenkins.sh
+++ b/ct/jenkins.sh
@@ -1,60 +1,33 @@
 #!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+source <(curl -s https://raw.githubusercontent.com/quantumryuu/ProxmoxVE/main/misc/build.func)
 # Copyright (c) 2021-2024 community-scripts ORG
 # Author: kristocopani
-# License: MIT
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://adguard.com/
 
-function header_info {
-clear
-cat <<"EOF"
-       __           __   _           
-      / /__  ____  / /__(_)___  _____
- __  / / _ \/ __ \/ //_/ / __ \/ ___/
-/ /_/ /  __/ / / / ,< / / / / (__  ) 
-\____/\___/_/ /_/_/|_/_/_/ /_/____/  
-                                      
-EOF
-}
-header_info
-echo -e "Loading..."
+# App Default Values
 APP="Jenkins"
-var_disk="4"
+var_tags="Jenkins"
 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 default_settings() {
-  CT_TYPE="1"
-  PW=""
-  CT_ID=$NEXTID
-  HN=$NSAPP
-  DISK_SIZE="$var_disk"
-  CORE_COUNT="$var_cpu"
-  RAM_SIZE="$var_ram"
-  BRG="vmbr0"
-  NET="dhcp"
-  GATE=""
-  APT_CACHER=""
-  APT_CACHER_IP=""
-  DISABLEIP6="no"
-  MTU=""
-  SD=""
-  NS=""
-  MAC=""
-  VLAN=""
-  SSH="no"
-  VERB="no"
-  echo_default
-}
 function update_script() {
-header_info
-check_container_storage
-check_container_resources
+  header_info
+  check_container_storage
+  check_container_resources
 }
 
 start
@@ -62,5 +35,6 @@ build_container
 description
 
 msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8080${CL} \n"
\ No newline at end of file
+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}"
\ No newline at end of file
diff --git a/install/jenkins-install.sh b/install/jenkins-install.sh
index a0c406da..d455aa49 100644
--- a/install/jenkins-install.sh
+++ b/install/jenkins-install.sh
@@ -5,7 +5,7 @@
 # License: MIT
 # https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
 color
 verb_ip6
 catch_errors
@@ -18,18 +18,15 @@ $STD apt-get install -y \
     curl \
     mc \
     sudo \
-    fontconfig \
     openjdk-17-jre
 msg_ok "Installed Dependencies"
 
-
-msg_info "Installing Jenkins"
+msg_info "Setup Jenkins"
 wget -qO /usr/share/keyrings/jenkins-keyring.asc https://pkg.jenkins.io/debian/jenkins.io-2023.key
 echo "deb [signed-by=/usr/share/keyrings/jenkins-keyring.asc]" https://pkg.jenkins.io/debian binary/ >/etc/apt/sources.list.d/jenkins.list
 $STD apt-get update
-$STD apt-get install -y \
-    jenkins
-msg_ok "Installed Jenkins"
+$STD apt-get install -y jenkins
+msg_ok "Setup Jenkins"
 
 motd_ssh
 customize