From a60f5dd83be1a4a7104fc8f2ee555a3380fe3199 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 22 Apr 2024 17:14:54 +0900 Subject: [PATCH] updated regarding Debian-Hyprland Project --- CHANGELOGS.md | 3 ++ README.md | 5 +++ install-scripts/dotfiles.sh | 88 ++++++++++++------------------------- install.sh | 7 ++- 4 files changed, 42 insertions(+), 61 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 6c4effe..cbddcf7 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## Changelogs +## 22 Apr 2024 +- Change dotfiles to specific version only as Debian and Ubuntu cant keep up with Hyprland development + ## 20 Apr 2024 - Change default Oh-my-zsh theme to xiong-chiamiov-plus diff --git a/README.md b/README.md index 8a75c72..7a7ef01 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ ### ♨️♨️♨️ ATTENTION ♨️♨️♨️ 06 Dec 2023 - Recent hyprland release v0.33.0, needed a newer libdrm and Debian dont have newer libdrm yet on their repo. That is why for now, the hyprland version to be installed with this script is v0.32.3 +### ♨️♨️♨️ ATTENTION ♨️♨️♨️ 22 Apr 2024 +- Pre-configured dotfiles to be downloaded here will be v2.2.6 only +- [`Hyprland-Dots v2.2.6`](https://github.com/JaKooLit/Hyprland-Dots/releases/tag/v2.2.6) +- This is because Debian/Ubuntu are very slow with Hyprland Development + > [!IMPORTANT] > install a backup tool like `snapper` or `timeshift`. and Backup your system before installing hyprland using this script. This script does NOT include uninstallation of packages diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index c1fd618..5630cb0 100755 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -1,83 +1,51 @@ #!/bin/bash # 💫 https://github.com/JaKooLit 💫 # -# Hyprland-Dots to download from Releases # +# Hyprland-Dots to download a specific release # + +# Define the specific release version to download +specific_version="v2.2.6" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" -printf "${NOTE} Downloading / Checking for existing Hyprland-Dots.tar.gz...\n" - -# Check if Hyprland-Dots.tar.gz exists -if [ -f Hyprland-Dots.tar.gz ]; then - printf "${NOTE} Hyprland-Dots.tar.gz found.\n" - - # Get the version from the existing tarball filename - existing_version=$(echo Hyprland-Dots.tar.gz | grep -oP 'v\d+\.\d+\.\d+' | sed 's/v//') - - # Fetch the tag_name for the latest release using the GitHub API - latest_version=$(curl -s https://api.github.com/repos/JaKooLit/Hyprland-Dots/releases/latest | grep "tag_name" | cut -d '"' -f 4 | sed 's/v//') - - # Check if versions match - if [ "$existing_version" = "$latest_version" ]; then - echo -e "${OK} Hyprland-Dots.tar.gz is up-to-date with the latest release ($latest_version)." - - # Sleep for 10 seconds before exiting - printf "${NOTE} No update found. Sleeping for 10 seconds...\n" - sleep 10 - exit 0 - else - echo -e "${WARN} Hyprland-Dots.tar.gz is outdated (Existing version: $existing_version, Latest version: $latest_version)." - read -p "Do you want to upgrade to the latest version? (y/n): " upgrade_choice - if [ "$upgrade_choice" = "y" ]; then - echo -e "${NOTE} Proceeding to download the latest release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" - - # Delete existing directories starting with JaKooLit-Hyprland-Dots - find . -type d -name 'JaKooLit-Hyprland-Dots*' -exec rm -rf {} + - rm -f Hyprland-Dots.tar.gz - printf "${WARN} Removed existing Hyprland-Dots.tar.gz.\n" - else - echo -e "${NOTE} User chose not to upgrade. Exiting..." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" - exit 0 - fi - fi -fi - -printf "\n" +printf "${NOTE} Downloading / Checking for existing Hyprland-Dots-${specific_version}.tar.gz...\n" -printf "${NOTE} Downloading the latest Hyprland-Dots source code release...\n" +# Check if the specific release tarball exists +if [ -f "Hyprland-Dots-${specific_version}.tar.gz" ]; then + printf "${NOTE} Hyprland-Dots-${specific_version}.tar.gz found.\n" + echo -e "${OK} Hyprland-Dots-${specific_version}.tar.gz is already downloaded." + exit 0 +fi -# Fetch the tag name for the latest release using the GitHub API -latest_tag=$(curl -s https://api.github.com/repos/JaKooLit/Hyprland-Dots/releases/latest | grep "tag_name" | cut -d '"' -f 4) +printf "${NOTE} Downloading the Hyprland-Dots-${specific_version} source code release...\n" -# Check if the tag is obtained successfully -if [ -z "$latest_tag" ]; then - echo -e "${ERROR} Unable to fetch the latest tag information." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" +# Fetch the tag name for the specific release using the GitHub API +release_info=$(curl -s "https://api.github.com/repos/JaKooLit/Hyprland-Dots/releases/tags/${specific_version}") +if [ -z "$release_info" ]; then + echo -e "${ERROR} Unable to fetch information for release ${specific_version}." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" exit 1 fi -# Fetch the tarball URL for the latest release using the GitHub API -latest_tarball_url=$(curl -s https://api.github.com/repos/JaKooLit/Hyprland-Dots/releases/latest | grep "tarball_url" | cut -d '"' -f 4) +# Get the tarball URL for the specific release +tarball_url=$(echo "$release_info" | grep "tarball_url" | cut -d '"' -f 4) # Check if the URL is obtained successfully -if [ -z "$latest_tarball_url" ]; then - echo -e "${ERROR} Unable to fetch the tarball URL for the latest release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" +if [ -z "$tarball_url" ]; then + echo -e "${ERROR} Unable to fetch the tarball URL for release ${specific_version}." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" exit 1 fi -# Get the filename from the URL and include the tag name in the file name -file_name="Hyprland-Dots-${latest_tag}.tar.gz" - -# Download the latest release source code tarball to the current directory -if curl -L "$latest_tarball_url" -o "$file_name"; then +# Download the specific release source code tarball to the current directory +if curl -L "$tarball_url" -o "Hyprland-Dots-${specific_version}.tar.gz"; then # Extract the contents of the tarball - tar -xzf "$file_name" || exit 1 + tar -xzf "Hyprland-Dots-${specific_version}.tar.gz" || exit 1 - # delete existing Hyprland-Dots + # Delete existing Hyprland-Dots rm -rf JaKooLit-Hyprland-Dots # Identify the extracted directory - extracted_directory=$(tar -tf "$file_name" | grep -o '^[^/]\+' | uniq) + extracted_directory=$(tar -tf "Hyprland-Dots-${specific_version}.tar.gz" | grep -o '^[^/]\+' | uniq) # Rename the extracted directory to JaKooLit-Hyprland-Dots mv "$extracted_directory" JaKooLit-Hyprland-Dots || exit 1 @@ -88,10 +56,10 @@ if curl -L "$latest_tarball_url" -o "$file_name"; then chmod +x copy.sh ./copy.sh - echo -e "${OK} Latest Dotfiles release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots folder for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" + echo -e "${OK} Hyprland-Dots-${specific_version} release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots folder for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" else - echo -e "${ERROR} Failed to download the latest Dotfiles release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" + echo -e "${ERROR} Failed to download Hyprland-Dots-${specific_version} release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log" exit 1 fi -clear \ No newline at end of file +clear diff --git a/install.sh b/install.sh index f71d227..f1f2211 100755 --- a/install.sh +++ b/install.sh @@ -32,6 +32,11 @@ echo "$(tput bold)$(tput setaf 7)Debian doesn't have the newer libdrm yet on the echo "$(tput bold)$(tput setaf 7)For now, the Hyprland version to be installed with this script will be v0.32.3$(tput sgr0)" printf "\n%.0s" {1..3} +printf "\n%.0s" {1..5} +echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! One MORE IMPORTANT NOTICE!!!! $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Dotfiles version to be downloaded here will be specific to v2.2.6 only $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Debian and Ubuntu Cant keep up with Hyprland development. $(tput sgr0)" +printf "\n%.0s" {1..3} read -p "$(tput setaf 6)Would you like to proceed? (y/n): $(tput sgr0)" proceed @@ -154,7 +159,7 @@ ask_yes_no "-Install nwg-look? (a GTK Theming app - lxappearance-like) WARN! Thi printf "\n" ask_yes_no "-Installing on Asus ROG Laptops?" rog printf "\n" -ask_yes_no "-Do you want to download and install pre-configured Hyprland-dotfiles?" dots +ask_yes_no "-Do you want to download and install pre-configured Hyprland-dotfiles v2.2.6?" dots printf "\n" # Ensuring all in the scripts folder are made executable