Skip to content

Commit

Permalink
Merge pull request #75 from JaKooLit/dev-Ubuntu-24.04-LTS
Browse files Browse the repository at this point in the history
Releasing a new installer to work with Hyprland-Dots v2.2.11
  • Loading branch information
JaKooLit authored May 13, 2024
2 parents 885db86 + 84ab9b7 commit 759bfe0
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 39 deletions.
10 changes: 10 additions & 0 deletions CHANGELOGS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
## Changelogs

## 10 May 2024
- added wallust-git and remove python-pywal for migration to wallust on Hyprland-Dots v2.2.11

## 07 May 2024
- added ags.sh for upcoming ags overview for next Hyprland-Dots release. Will be installed form source

## 03 May 2024
- Bump swww to v0.9.5
- added python3-pyquery for new weather-waybar python based on Hyprland-Dots

## 03 May 2024
- Bump swww to v0.9.5
- added python3-pyquery for new weather-waybar python based on Hyprland-Dots
Expand Down
77 changes: 77 additions & 0 deletions install-scripts/ags.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
7#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# Aylur's GTK Shell #

ags=(
node-typescript
npm
meson
libgjs-dev
gjs
libgtk-layer-shell-dev
libgtk-3-dev
libpulse-dev
libdbusmenu-gtk3-dev
libsoup-3.0-dev
)

# specific tags to download
ags_tag="v1.8.2"

## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
# Determine the directory where the script is located
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Change the working directory to the parent directory of the script
PARENT_DIR="$SCRIPT_DIR/.."
cd "$PARENT_DIR" || exit 1

source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"

# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log"
MLOG="install-$(date +%d-%H%M%S)_ags.log"

# Installing ags Dependencies
for PKG1 in "${ags[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done

#install typescript by npm
sudo npm install --global typescript 2>&1 | tee -a "$LOG"

# ags

printf "${NOTE} Install and Compiling Aylurs GTK shell\n"

# Check if folder exists and remove it
if [ -d "ags" ]; then
printf "${NOTE} Removing existing ags folder...\n"
rm -rf "ags"
fi

# Clone nwg-look repository with the specified tag
if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.git; then
cd ags || exit 1
# Build and install ags
npm install
meson setup build
if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
printf "${OK} ags installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for ags" 2>&1 | tee -a "$MLOG"
fi

# Move logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG"
mv "$MLOG" ../Install-Logs/ || true
exit 1
fi

2 changes: 1 addition & 1 deletion install-scripts/dotfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Hyprland-Dots to download a specific release #

# Define the specific release version to download
specific_version="v2.2.10-1"
specific_version="v2.2.11"

## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

Expand Down
9 changes: 4 additions & 5 deletions install-scripts/hypr-eco.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# Hyprland plugins: pyprland

pypr_depend=(
python-is-python3
python3-aiofiles
python-is-python3
)

## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
Expand Down Expand Up @@ -40,8 +41,6 @@ printf "${NOTE} Installing pyprland\n"

curl https://raw.githubusercontent.com/hyprland-community/pyprland/main/scripts/get-pypr | sh 2>&1 | tee -a "$LOG"

pip install pyprland --break-system-packages 2>&1 | tee -a "$LOG"



pip install pyprland 2>&1 | tee -a "$LOG"

clear
32 changes: 0 additions & 32 deletions install-scripts/pywal.sh

This file was deleted.

64 changes: 64 additions & 0 deletions install-scripts/wallust.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# wallust - pywal colors replacment #

depend=(
librust-jpeg-decoder-dev
imagemagick
rustup
)

#specific branch or release
wal_tag="dev"

## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
# Determine the directory where the script is located
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Change the working directory to the parent directory of the script
PARENT_DIR="$SCRIPT_DIR/.."
cd "$PARENT_DIR" || exit 1

source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"

# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log"
MLOG="install-$(date +%d-%H%M%S)_wallust.log"

# Installing depencies
for PKG1 in "${depend[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done

##
printf "${NOTE} Installing wallust from dev branch...\n"

# Check if folder exists and remove it
if [ -d "wallust" ]; then
printf "${NOTE} Removing existing wallust folder...\n"
rm -rf "wallust"
fi

# Clone and build wallust
printf "${NOTE} Installing wallust...\n"
if git clone --depth 1 -b $wal_tag https://codeberg.org/explosion-mental/wallust.git; then
cd wallust || exit 1
make
if sudo make install 2>&1 | tee -a "$MLOG" ; then
printf "${OK} wallust installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for wallust." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for wallust." 2>&1 | tee -a "$LOG"
fi

clear

3 changes: 2 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,9 @@ execute_script "fonts.sh"
execute_script "swappy.sh"
execute_script "swww.sh"
execute_script "rofi-wayland.sh"
execute_script "pywal.sh"
execute_script "wallust.sh"
execute_script "force-install.sh"
execute_script "ags.sh"
execute_script "hyprlang.sh"
execute_script "hyprlock.sh"
execute_script "hyprcursor.sh"
Expand Down

0 comments on commit 759bfe0

Please sign in to comment.