From 366223d09ce8875f3a457f41b9cc8027983cac2f Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Sun, 29 Aug 2021 19:50:59 +0930 Subject: [PATCH] minor changes --- default-programs | 2 +- install-config | 20 ++++++++++++-------- install-misc | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/default-programs b/default-programs index 26453c2..56e64bf 100644 --- a/default-programs +++ b/default-programs @@ -47,12 +47,12 @@ xterm flameshot simple-mtpfs micro +mpv DEPENDENCIES_END DEPENDENCIES_LAPTOP_START backlight_control powerkit -mpv DEPENDENCIES_LAPTOP_END DEFAULTS_START diff --git a/install-config b/install-config index d358c54..d36ba90 100755 --- a/install-config +++ b/install-config @@ -33,7 +33,11 @@ function config { git clone --bare https://gitlab.inkletblot.com/inkletblot/config.git $HOME/.cfg -echo "The script will now attempt to install the configs, if configs have been installed using the method found here: https://www.atlassian.com/git/tutorials/dotfiles, there will be issues." +echo " + +The script will now attempt to install the configs, if configs have been installed using the method found here: https://www.atlassian.com/git/tutorials/dotfiles, there will be issues. + +" echo "There are configs for laptops, my personal desktop, and a general config. Which would you like to intsall?" echo "Standard, 1" @@ -43,13 +47,13 @@ read -r -p "Choose one (default=1): " choice case $choice in 3) - checkout arch-desktop + config checkout arch-desktop ;; 2) - checkout arch-laptop + config checkout arch-laptop ;; *) - checkout main + config checkout main ;; esac @@ -58,18 +62,18 @@ if [ $? = 0 ]; then else echo "Backing up pre-existing dot files."; mkdir -p .config-backup - config checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv {} .config-backup/{} + config checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | xargs -I{} mv $HOME/{} .config-backup/{} fi; case $choice in 3) - checkout arch-desktop + config checkout arch-desktop ;; 2) - checkout arch-laptop + config checkout arch-laptop ;; *) - checkout main + config checkout main ;; esac diff --git a/install-misc b/install-misc index c36cc7c..5da6275 100755 --- a/install-misc +++ b/install-misc @@ -1,12 +1,12 @@ #!/bin/sh #----------------------------------- -# Name: install-yay +# Name: install-misc # Version: 1.0.0 # Author: Solomon Laing # Description: -# Installs the AUR helper yay on the -# system. +# Installs all of my misc programs to +# the system. #----------------------------------- clear