Merge pull request #120 from Drazzilb08/dev

Last minute bug fixes

Author: Drazzilb08

Dockerfile

@@ -47,19 +47,14 @@ ENV TZ=America/Los_Angeles
 ENV BRANCH=${BRANCH}
 ENV DOCKER_ENV=true
 
-# Install curl, unzip, p7zip-full, tzdata, vim, rclone and docker-cli - remove curl and clean up
-# Delete unnecessary setup files
+# 
+# 
 RUN set -eux; \
     rm -f Pipfile Pipfile.lock; \
     apt-get update; \
-    apt-get install -y --no-install-recommends wget curl unzip p7zip-full tzdata vim jdupes jq nano; \
+    apt-get install -y --no-install-recommends wget curl unzip p7zip-full tzdata jdupes jq; \
     curl https://rclone.org/install.sh | bash
 
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends docker.io; \
-    docker --version
-
-VOLUME /var/run/docker.sock
 VOLUME /config
 VOLUME /data
 

extra-scripts/backup_appdata.sample.conf

@@ -39,7 +39,7 @@ exclusion_list=(
     # "Container 2"
     # "Container 3"
     "plex"
-    "userScripts"
+    "daps"
 )
 
 # Define locations for appdata directories

extra-scripts/backup_appdata.sh

@@ -562,20 +562,20 @@ send_notification() {
     # Get a random joke from the specified file
     # Check if the webhook is for discord
     if [[ "$webhook" =~ ^https://discord\.com/api/webhooks/ ]]; then
-        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
         discord_common_fields
         bot_name="Notification Bot"
         # Call the discord_payload function to construct the payload
         if [ ${#new_container[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
             new_container_notification
             new_container_response=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
                 echo "$new_container_response"
             fi
         fi
         if [ ${#removed_containers[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
             removed_container_notification
             removed_container=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
@@ -594,19 +594,19 @@ send_notification() {
     fi
     # Check if the webhook is for notifiarr
     if [[ $webhook =~ ^https://notifiarr\.com/api/v1/notification/passthrough ]]; then
-        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
         notifiarr_common_fields
         # Call the notifiarr_payload function to construct the payload
         if [ ${#new_container[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
             new_container_notification
             new_container_response=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
                 echo "$new_container_response"
             fi
         fi
         if [ ${#removed_containers[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
             removed_container_notification
             removed_container=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then

extra-scripts/backup_folder.sh

@@ -202,7 +202,7 @@ send_notification() {
     # Get current time in UTC format
     get_ts=$(date -u -Iseconds)
     # Get a random joke from the specified file
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
     # Check if the webhook is for discord
     if [[ $webhook =~ ^https://discord\.com/api/webhooks/ ]]; then
         # Call the discord_payload function to construct the payload

extra-scripts/backup_plex.sh

@@ -223,7 +223,7 @@ field_builder() {
 build_payload(){
     get_ts=$(date -u -Iseconds)
     # Get a random joke from the specified file
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
     # ensure joke is valid for json
     # shellcheck disable=SC2001
     joke=$(echo "$joke" | sed 's/"/\\"/g')    

scripts/jduparr.sh

@@ -180,7 +180,7 @@ hex_to_decimal() {
 
 send_notification() {
     get_ts=$(date -u -Iseconds)
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
     if [ -n "$webhook" ]; then
         if [[ "$webhook" =~ ^https://discord\.com/api/webhooks/ ]]; then
             discord_common_fields

scripts/nohl_bash.sh

@@ -157,7 +157,7 @@ check_hardlinks() {
 # Function to send notification
 send_notification() {
     # Get a random joke from a file hosted on Github
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/userScripts/master/jokes.txt | shuf -n 1)
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
     # Get the current timestamp
     get_ts=$(date -u -Iseconds)
     number_of_issues=0

start.sh

@@ -12,12 +12,12 @@ VERSION=$(cat "$(dirname "$0")/VERSION")
 
 echo "
 ---------------------------------------------------------
-    _____          _____   _____ 
-    |  __ \\   /\   |  __ \\ / ____|
-    | |  | | /  \\  | |__) | (___  
-    | |  | |/ /\ \\ |  ___/ \\___ \\ 
-    | |__| / ____ \\| |     ____) |
-    |_____/_/    \_\\_|    |_____/ 
+     _____          _____   _____ 
+    |  __ \   /\   |  __ \ / ____|
+    | |  | | /  \  | |__) | (___  
+    | |  | |/ /\ \ |  ___/ \___ \ 
+    | |__| / ____ \| |     ____) |
+    |_____/_/    \_\_|    |_____/ 
      (Drazzilb's Arr PMM Scripts)
                                
         PUID:           ${PUID}
@@ -42,15 +42,15 @@ usermod -o -u "$PUID" dockeruser
 # Download latest config files if they don't exist or are different
 file="config.sample.yml"
 local_file="$CONFIG_DIR/$file"
-if [ ! -f "$local_file" ] || [ "$(curl -s "https://raw.githubusercontent.com/Drazzilb08/userScripts/${BRANCH}/config/$file" | diff -q - "$local_file")" ]; then
+if [ ! -f "$local_file" ] || [ "$(curl -s "https://raw.githubusercontent.com/Drazzilb08/daps/${BRANCH}/config/$file" | diff -q - "$local_file")" ]; then
     echo "Downloading latest $file"
-    curl -s "https://raw.githubusercontent.com/Drazzilb08/userScripts/${BRANCH}/config/$file" -o "$local_file"
+    curl -s "https://raw.githubusercontent.com/Drazzilb08/daps/${BRANCH}/config/$file" -o "$local_file"
 else
     echo "File $file is up to date"
 fi
 
 
-echo "Starting userScripts as $(whoami) running userscripts with UID: $PUID and GID: $PGID"
+echo "Starting daps as $(whoami) running daps with UID: $PUID and GID: $PGID"
 
 chown -R ${PUID}:${PGID} /${CONFIG_DIR} /app > /dev/null 2>&1
 chmod -R 777 /${CONFIG_DIR} > /dev/null 2>&1

util/version.py

@@ -33,7 +33,7 @@ def version_check(logger, branch):
         script_version = f.read().strip()
 
     # Construct the URL for the GitHub raw file containing the version
-    github_url = f"https://raw.githubusercontent.com/Drazzilb08/userScripts/{branch}/VERSION"
+    github_url = f"https://raw.githubusercontent.com/Drazzilb08/daps/{branch}/VERSION"
 
     # Send a GET request to the GitHub URL to fetch the script's version from GitHub
     response = requests.get(github_url)