some more fixes

This commit is contained in:
David Young
2026-03-24 10:50:38 -06:00
parent 49e9adf0a5
commit 21261973fe
2 changed files with 4 additions and 35 deletions

View File

@@ -29,7 +29,7 @@ wget=https://www.ka2ddo.org/ka2ddo/YAAC.zip
install=$HOME/.local/bin/yaac/YAAC.jar install=$HOME/.local/bin/yaac/YAAC.jar
desktop=$HOME/.local/share/HamPack/desktop/yaac.desktop desktop=$HOME/.local/share/HamPack/desktop/yaac.desktop
gui=true gui=true
steps=rm -rf $HOME/.local/bin/yaac, mkdir -p $HOME/.local/bin/yaac, mv /tmp/hampack-build/yaac $HOME/.local/bin/yaac steps=rm -rf $HOME/.local/bin/yaac, mkdir -p $HOME/.local/bin/yaac, mv /tmp/hampack-build/yaac/* $HOME/.local/bin/yaac/
[potacat] [potacat]
version=1.1.1 version=1.1.1

View File

@@ -5,33 +5,29 @@
# Print the logo # Print the logo
print_logo() { print_logo() {
cat << "EOF" cat << "EOF"
██╗ ██╗ █████╗ ███╗ ███╗██████╗ █████╗ ██████╗██╗ ██╗ ██╗ ██╗ █████╗ ███╗ ███╗██████╗ █████╗ ██████╗██╗ ██╗
██║ ██║██╔══██╗████╗ ████║██╔══██╗██╔══██╗██╔════╝██║ ██╔╝ ██║ ██║██╔══██╗████╗ ████║██╔══██╗██╔══██╗██╔════╝██║ ██╔╝
███████║███████║██╔████╔██║██████╔╝███████║██║ █████╔╝ ███████║███████║██╔████╔██║██████╔╝███████║██║ █████╔╝
██╔══██║██╔══██║██║╚██╔╝██║██╔═══╝ ██╔══██║██║ ██╔═██╗ ██╔══██║██╔══██║██║╚██╔╝██║██╔═══╝ ██╔══██║██║ ██╔═██╗
██║ ██║██║ ██║██║ ╚═╝ ██║██║ ██║ ██║╚██████╗██║ ██╗ ██║ ██║██║ ██║██║ ╚═╝ ██║██║ ██║ ██║╚██████╗██║ ██╗
╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝
EOF EOF
} }
# --- Main --- # --- Main ---
set -e set -e
clear clear
print_logo print_logo
cd ~ cd ~
sudo -v sudo -v
echo "Getting the latest version of HamPack..." echo "Getting the latest version of HamPack..."
rm -rf ~/.local/share/HamPack rm -rf ~/.local/share/HamPack
git clone https://gitea.young.computer/david/HamPack.git ~/.local/share/HamPack > /dev/null git clone https://gitea.young.computer/david/HamPack.git ~/.local/share/HamPack > /dev/null
mkdir -p ~/.local/bin
sudo cp ~/.local/share/HamPack/hampackrefresh ~/.local/bin/hampackrefresh sudo cp ~/.local/share/HamPack/hampackrefresh ~/.local/bin/hampackrefresh
sudo cp ~/.local/share/HamPack/hampackupdate ~/.local/bin/hampackupdate sudo cp ~/.local/share/HamPack/hampackupdate ~/.local/bin/hampackupdate
@@ -47,30 +43,6 @@ if [ ! -f "packages.conf" ]; then
fi fi
source packages.conf source packages.conf
# echo "Updating system..."
# sudo pacman -Syu --noconfirm
cd ~/
# Install yay AUR helper if not present
#if ! command -v yay &> /dev/null; then
# echo "Installing yay AUR helper..."
# sudo pacman -S --needed git base-devel --noconfirm
# if [[ -d "yay" ]]; then
# echo "yay directory already exists, removing it..."
# rm -rf yay
# fi
# echo "Cloning yay repository..."
# git clone https://aur.archlinux.org/yay.git
# cd yay
# echo "Building yay..."
# makepkg -si --noconfirm
# cd ..
# rm -rf yay
#else
# echo "yay is already installed."
#fi
echo "Installing system utilities..." echo "Installing system utilities..."
install_packages "${UTILITIES[@]}" install_packages "${UTILITIES[@]}"
@@ -83,15 +55,12 @@ echo "Installing Flatpak applications..."
. install-flatpaks.sh . install-flatpaks.sh
echo "Installing stand-alone compiled applications..." echo "Installing stand-alone compiled applications..."
. install-compiled.sh . install-compiled.sh
echo "Installing Windows-only applications..." echo "Installing Windows-only applications..."
. install-windows-apps.sh . install-windows-apps.sh
echo "Installing not1mm..." echo "Installing not1mm..."
curl -LsSf uvx.sh/not1mm/install.sh | sh curl -LsSf uvx.sh/not1mm/install.sh | sh
echo "Ham Pack is installed. You may want to restart existing applications when convenient." echo "HamPack is installed. You may want to restart existing applications when convenient."