From dfc26b5056251ce782d2ee92c046b7c035b34180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Sun, 17 Jul 2022 20:12:11 +0200 Subject: [PATCH] Add sway installation package --- installed_packages/core/{Arch => pacman} | 0 installed_packages/extended/{Arch => pacman} | 0 installed_packages/sway/Arch | 10 ++++ installed_packages/sway/apt | 10 ++++ installed_packages/sway/dnf | 10 ++++ .../bin/clone-installation-from-directory | 2 +- symlinks/bin/migrate-installation | 2 +- symlinks/config/.gitignore | 1 + .../parse-package-managers-params.bash | 52 +++++++++++++++++++ 9 files changed, 85 insertions(+), 2 deletions(-) rename installed_packages/core/{Arch => pacman} (100%) rename installed_packages/extended/{Arch => pacman} (100%) create mode 100644 installed_packages/sway/Arch create mode 100644 installed_packages/sway/apt create mode 100644 installed_packages/sway/dnf create mode 100755 symlinks/script_utils/parse-package-managers-params.bash diff --git a/installed_packages/core/Arch b/installed_packages/core/pacman similarity index 100% rename from installed_packages/core/Arch rename to installed_packages/core/pacman diff --git a/installed_packages/extended/Arch b/installed_packages/extended/pacman similarity index 100% rename from installed_packages/extended/Arch rename to installed_packages/extended/pacman diff --git a/installed_packages/sway/Arch b/installed_packages/sway/Arch new file mode 100644 index 0000000..269c66e --- /dev/null +++ b/installed_packages/sway/Arch @@ -0,0 +1,10 @@ +sway +mako +aerc +fish +foot +htop +ulauncher +waybar +wl-clipboard +wlogout diff --git a/installed_packages/sway/apt b/installed_packages/sway/apt new file mode 100644 index 0000000..269c66e --- /dev/null +++ b/installed_packages/sway/apt @@ -0,0 +1,10 @@ +sway +mako +aerc +fish +foot +htop +ulauncher +waybar +wl-clipboard +wlogout diff --git a/installed_packages/sway/dnf b/installed_packages/sway/dnf new file mode 100644 index 0000000..269c66e --- /dev/null +++ b/installed_packages/sway/dnf @@ -0,0 +1,10 @@ +sway +mako +aerc +fish +foot +htop +ulauncher +waybar +wl-clipboard +wlogout diff --git a/symlinks/bin/clone-installation-from-directory b/symlinks/bin/clone-installation-from-directory index 8bb7955..01a24a1 100755 --- a/symlinks/bin/clone-installation-from-directory +++ b/symlinks/bin/clone-installation-from-directory @@ -8,7 +8,7 @@ if [ "${RUN[pacman]}" = "1" ] then # Install arch packages echo "Installing Arch packages..." - sudo xargs -a $SELECTED_INSTALL_DIR/Arch pacman -S --noconfirm --needed + sudo xargs -a $SELECTED_INSTALL_DIR/pacman pacman -S --noconfirm --needed echo "Installing packages from AUR using aurfetch..." while read p; do diff --git a/symlinks/bin/migrate-installation b/symlinks/bin/migrate-installation index ad8e519..9d62e30 100755 --- a/symlinks/bin/migrate-installation +++ b/symlinks/bin/migrate-installation @@ -18,7 +18,7 @@ CURDIR=$PWD if type pacman > /dev/null 2>&1 then - pacman -Qqe | grep -vx "$(pacman -Qqm)" > $PACKAGES_DIRECTORY/Arch + pacman -Qqe | grep -vx "$(pacman -Qqm)" > $PACKAGES_DIRECTORY/pacman pacman -Qqm > $PACKAGES_DIRECTORY/AUR fi diff --git a/symlinks/config/.gitignore b/symlinks/config/.gitignore index 0ba2c12..184879c 100644 --- a/symlinks/config/.gitignore +++ b/symlinks/config/.gitignore @@ -57,3 +57,4 @@ !/sh-utils/** !/sh-utils/ !/aerc/** +!/aerc/ diff --git a/symlinks/script_utils/parse-package-managers-params.bash b/symlinks/script_utils/parse-package-managers-params.bash new file mode 100755 index 0000000..08a9842 --- /dev/null +++ b/symlinks/script_utils/parse-package-managers-params.bash @@ -0,0 +1,52 @@ +#!/bin/bash + +declare -A SKIP=() +POSITIONAL=() + +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + -s|--skip) + shift # past argument + SKIP["$1"]=1 + shift # past value + ;; + *) # unknown option + POSITIONAL+=("$1") # save it in an array for later + shift # past argument + ;; + esac +done + +declare -A RUN=() + +for command in "pacman" "apt" "dnf" "flatpak" "gem" "nvim" "asdf" "brew" "pacman" "pip" "pip2" "pip3"; +do + if type $command > /dev/null 2>&1 + then + if [ "${SKIP[$command]}" = "1" ]; then + RUN[$command]=0 + else + RUN[$command]=1 + fi + else + RUN[$command]=0 + fi +done + +# Special case for vim +if type -f vim > /dev/null 2>&1 +then + if [ "${SKIP[vim]}" = "1" ]; then + RUN[vim]=0 + else + RUN[vim]=1 + fi +else + RUN[vim]=0 +fi + +export SKIP=$SKIP +export RUN=$RUN +export POSITIONAL=$POSITIONAL