From 66aab2ccf92abb7fab11294f943c3a1b385ae740 Mon Sep 17 00:00:00 2001
From: Iam iAGorynT <108758623+iAGorynT@users.noreply.github.com>
Date: Sat, 2 Nov 2024 18:54:12 -0500
Subject: [PATCH] Update BrewautoInstaller.sh

Imbedded new GithubDownLoader Function to replace script calls and reduce number of files required to install new Brewauto system to 1.
---
 ShellScripts/BrewautoInstaller.sh | 64 ++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/ShellScripts/BrewautoInstaller.sh b/ShellScripts/BrewautoInstaller.sh
index d6987b9..d05377e 100755
--- a/ShellScripts/BrewautoInstaller.sh
+++ b/ShellScripts/BrewautoInstaller.sh
@@ -31,35 +31,71 @@ display_message() {
     esac
 }
 
-# Make User Bin Direcory and Download Shell Scripts
+# Function to download a file from GitHub
+download_github_file() {
+    # Check if curl is installed
+    if ! command -v curl &>/dev/null; then
+        echo "Error: curl is not installed. Please install curl to use this script."
+        return 3
+    fi
+
+    # Check if all required arguments are provided
+    if [ "$#" -ne 4 ]; then
+        echo "Usage: $0 owner repo branch filepath"
+        echo "Example: $0 microsoft vscode main README.md"
+        return 1
+    fi
+
+    local owner=$1
+    local repo=$2
+    local branch=$3
+    local filepath=$4
+    local github_raw_url="https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${filepath}"
+    local filename=$(basename "$filepath")
+    
+    # Check if the file already exists and prompt for overwrite
+    if [ -f "$filename" ]; then
+        read "overwrite?File $filename already exists. Overwrite? (y/N): "
+        if [[ ! "$overwrite" =~ ^[Yy]$ ]]; then
+            echo "Download canceled."
+            return 1
+        fi
+    fi
+
+    # Attempt to download the file
+    echo "Downloading ${filename} from ${github_raw_url}..."
+    
+    if curl -L -o "$filename" "$github_raw_url"; then
+        echo "Successfully downloaded ${filename}"
+        echo "File saved as: $(pwd)/${filename}"
+        return 0
+    else
+        echo "Error: Failed to download the file from ${github_raw_url}"
+        return 2
+    fi
+}
+
+# Make User Bin Directory and Download Shell Scripts
 mkdir -p "$BIN_FOLDER"
 cd "$BIN_FOLDER"
 
-# Run the GitHub download script
-GithubDownloader.sh iAGorynT Brew-Autoupdate main bin/Brewautom2.sh
+# Download files using the download_github_file function
+download_github_file iAGorynT Brew-Autoupdate main bin/Brewautom2.sh
 ret_code=$?
-
-# Call the display_message function with the return code
 display_message $ret_code
 echo
 
-# Run the GitHub download script
-GithubDownloader.sh iAGorynT Brew-Autoupdate main bin/BrewitLaunchd.sh
+download_github_file iAGorynT Brew-Autoupdate main bin/BrewitLaunchd.sh
 ret_code=$?
-
-# Call the display_message function with the return code
 display_message $ret_code
 echo
 
-# Make User Launchd Direcory and Download Plist Files
+# Make User Launchd Directory and Download Plist Files
 mkdir -p "$LAUNCHD_FOLDER"
 cd "$LAUNCHD_FOLDER"
 
-# Run the GitHub download script
-$HOME/bin/GithubDownloader.sh iAGorynT Brew-Autoupdate main Launchd/Launchd.plist
+download_github_file iAGorynT Brew-Autoupdate main Launchd/Launchd.plist
 ret_code=$?
-
-# Call the display_message function with the return code
 display_message $ret_code
 echo