diff --git a/compile.conf b/compile.conf index 12c12d0..5196e66 100644 --- a/compile.conf +++ b/compile.conf @@ -29,7 +29,7 @@ wget=https://www.ka2ddo.org/ka2ddo/YAAC.zip install=$HOME/.local/bin/yaac/YAAC.jar desktop=$HOME/.local/share/HamPack/desktop/yaac.desktop 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] version=1.1.1 diff --git a/install.sh b/install.sh index c308e93..c47eb73 100755 --- a/install.sh +++ b/install.sh @@ -5,33 +5,29 @@ # Print the logo print_logo() { cat << "EOF" - ██╗ ██╗ █████╗ ███╗ ███╗██████╗ █████╗ ██████╗██╗ ██╗ ██║ ██║██╔══██╗████╗ ████║██╔══██╗██╔══██╗██╔════╝██║ ██╔╝ ███████║███████║██╔████╔██║██████╔╝███████║██║ █████╔╝ ██╔══██║██╔══██║██║╚██╔╝██║██╔═══╝ ██╔══██║██║ ██╔═██╗ ██║ ██║██║ ██║██║ ╚═╝ ██║██║ ██║ ██║╚██████╗██║ ██╗ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ - - - EOF } # --- Main --- set -e - clear print_logo - cd ~ + sudo -v echo "Getting the latest version of HamPack..." rm -rf ~/.local/share/HamPack 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/hampackupdate ~/.local/bin/hampackupdate @@ -47,30 +43,6 @@ if [ ! -f "packages.conf" ]; then fi 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..." install_packages "${UTILITIES[@]}" @@ -83,15 +55,12 @@ echo "Installing Flatpak applications..." . install-flatpaks.sh echo "Installing stand-alone compiled applications..." - . install-compiled.sh echo "Installing Windows-only applications..." - . install-windows-apps.sh echo "Installing not1mm..." - curl -LsSf uvx.sh/not1mm/install.sh | sh -echo "Ham Pack is installed. You may want to restart existing applications when convenient." \ No newline at end of file +echo "HamPack is installed. You may want to restart existing applications when convenient." \ No newline at end of file