diff --git a/bin/omakub-install b/bin/omakub-install index c162fc5..3fccb20 100644 --- a/bin/omakub-install +++ b/bin/omakub-install @@ -1,4 +1,4 @@ #!/bin/bash INSTALLER=$(gum file $OMAKUB_PATH/install) -[ -n "$INSTALLER" ] && gum confirm "Run installer?" && source $INSTALLER +[ -n "$INSTALLER" ] && gum confirm "Run installer?" && FORCE=1 source $INSTALLER diff --git a/install/alacritty.sh b/install/alacritty.sh index 859b4b6..6ed058a 100644 --- a/install/alacritty.sh +++ b/install/alacritty.sh @@ -1,4 +1,4 @@ -if ! command -v alacritty &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v alacritty &>/dev/null; then sudo apt install -y alacritty mkdir -p ~/.config/alacritty cp $OMAKUB_PATH/configs/alacritty.toml ~/.config/alacritty/alacritty.toml diff --git a/install/chrome.sh b/install/chrome.sh index d545e2d..6708ead 100644 --- a/install/chrome.sh +++ b/install/chrome.sh @@ -1,4 +1,4 @@ -if ! command -v google-chrome &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v google-chrome &>/dev/null; then cd ~/Downloads wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb sudo dpkg -i google-chrome-stable_current_amd64.deb diff --git a/install/docker.sh b/install/docker.sh index 237090f..bb5a2cd 100644 --- a/install/docker.sh +++ b/install/docker.sh @@ -1,4 +1,4 @@ -if ! command -v docker &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v docker &>/dev/null; then sudo apt install -y docker.io docker-buildx sudo usermod -aG docker ${USER} diff --git a/install/emojis.sh b/install/emojis.sh index b001ff4..1f06a54 100644 --- a/install/emojis.sh +++ b/install/emojis.sh @@ -1,4 +1,4 @@ -if [ ! -f "~/.XCompose" ]; then +if [ -n "$FORCE" ] || [ ! -f "~/.XCompose" ]; then cp $OMAKUB_PATH/configs/xcompose ~/.XCompose ibus restart gsettings set org.gnome.desktop.input-sources xkb-options "['compose:caps']" diff --git a/install/flameshot.sh b/install/flameshot.sh index a045e49..5c21d1c 100644 --- a/install/flameshot.sh +++ b/install/flameshot.sh @@ -1,4 +1,4 @@ # Flameshot is a nice step-up over the default Gnome screenshot tool -if ! command -v flameshot &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v flameshot &>/dev/null; then sudo apt install -y flameshot fi diff --git a/install/gh.sh b/install/gh.sh index 9e9c627..50f2fab 100644 --- a/install/gh.sh +++ b/install/gh.sh @@ -1,4 +1,4 @@ -if ! command -v gh &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v gh &>/dev/null; then curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list >/dev/null && diff --git a/install/gnome-extensions.sh b/install/gnome-extensions.sh index e160250..7becb53 100644 --- a/install/gnome-extensions.sh +++ b/install/gnome-extensions.sh @@ -1,4 +1,4 @@ -if ! command -v gnome-shell-extension-manager &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v gnome-shell-extension-manager &>/dev/null; then sudo apt install -y gnome-shell-extension-manager pipx pipx install gnome-extensions-cli --system-site-packages diff --git a/install/neovim.sh b/install/neovim.sh index 98f8e33..5780e40 100644 --- a/install/neovim.sh +++ b/install/neovim.sh @@ -1,4 +1,4 @@ -if ! command -v neovim &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v neovim &>/dev/null; then sudo add-apt-repository -y ppa:neovim-ppa/stable sudo apt update -y sudo apt install -y neovim diff --git a/install/nodenv.sh b/install/nodenv.sh index 5e8bff0..1f7950a 100644 --- a/install/nodenv.sh +++ b/install/nodenv.sh @@ -1,4 +1,4 @@ -if ! command -v nodenv &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v nodenv &>/dev/null; then # FIXME: Make this pick whatever the latest LTS is DEFAULT_NODE_VERSION="20.13.1" diff --git a/install/ruby.sh b/install/ruby.sh index 022a4bc..5c89f5f 100644 --- a/install/ruby.sh +++ b/install/ruby.sh @@ -1,4 +1,4 @@ -if ! command -v rbenv &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v rbenv &>/dev/null; then # FIXME: Change to use whatever latest release is DEFAULT_RUBY_VERSION="3.3.1" diff --git a/install/typora.sh b/install/typora.sh index 825049c..e696c51 100644 --- a/install/typora.sh +++ b/install/typora.sh @@ -1,4 +1,4 @@ -if ! command -v typora &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v typora &>/dev/null; then sudo snap install typora cd ~/Downloads git clone https://github.com/dhh/ia_typora diff --git a/install/ulauncher.sh b/install/ulauncher.sh index a27f1d6..41b2f97 100644 --- a/install/ulauncher.sh +++ b/install/ulauncher.sh @@ -1,4 +1,4 @@ -if ! command -v ulauncher &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v ulauncher &>/dev/null; then sudo add-apt-repository universe -y sudo add-apt-repository ppa:agornostal/ulauncher -y sudo apt update -y diff --git a/install/vscode.sh b/install/vscode.sh index d40f9b1..a834ac1 100644 --- a/install/vscode.sh +++ b/install/vscode.sh @@ -1,4 +1,4 @@ -if ! command -v code &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v code &>/dev/null; then sudo snap install code --classic mkdir -p ~/.config/Code/User cp $OMAKUB_PATH/configs/vscode.json ~/.config/Code/User/settings.json diff --git a/install/zellij.sh b/install/zellij.sh index 6df21a9..345a4df 100644 --- a/install/zellij.sh +++ b/install/zellij.sh @@ -1,4 +1,4 @@ -if ! command -v zellij &>/dev/null; then +if [ -n "$FORCE" ] || ! command -v zellij &>/dev/null; then sudo snap install zellij --classic mkdir -p ~/.config/zellij/ cp $OMAKUB_PATH/configs/zellij.kdl ~/.config/zellij/config.kdl