diff --git a/install-packages.sh b/install-packages.sh index 38c36f3..5195ff1 100644 --- a/install-packages.sh +++ b/install-packages.sh @@ -8,12 +8,13 @@ if [ 0 -eq $(id -u) ]; then echo If it will need permission it will use 'sudo' command. else if [ $DISTRIB_ID == "ManjaroLinux" ]; then - echo Install bat - sudo pacman -S bat - echo Install kak - sudo pacman -S kakoune - echo Install Alacritty - sudo pacman -S alacritty + install_command='pacman -S --needed' + echo Install bat + sudo $install_command bat + echo Install kak + sudo $install_command kakoune + echo Install Alacritty + sudo $install_command alacritty fi fi diff --git a/install.zsh b/install.zsh index fbc8246..3332821 100755 --- a/install.zsh +++ b/install.zsh @@ -1,13 +1,5 @@ #!/usr/bin/env zsh # env, because some OSes keep zsh in /bin (I'm looking at you, Alpine) -# if [[ "$1" == "update" ]]; then -# cp .zshrc $HOME -# if [ -d "${HOME}/.zsh" ]; then -# rm -r $HOME/.zsh -# fi -# cp -r .zsh $HOME -# exit -# fi cp .zshrc $HOME if [ ! -d "${HOME}/.oh-my-zsh" ]; then sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" @@ -28,6 +20,7 @@ fi if [ -n "${ANDROID_SDK_ROOT}" ]; then sed -i "s%\#export ANDROID_SDK_ROOT=\"\"%export ANDROID_SDK_ROOT=\"$ANDROID_SDK_ROOT\"%g" $HOME/.zsh/env.zsh fi -cp -r ./.local/bin $HOME/.local -chmod -R +x $HOME/.local/bin +# cp -r ./.local/bin $HOME/.local +# chmod -R +x $HOME/.local/bin +git clone --bare git@github.com:mlunax/dotfiles.git $HOME/.dotfiles source $HOME/.zshrc