diff --git a/appconfig/tmux/bashconfig b/appconfig/tmux/bashconfig index 4d45a51..caf7479 100644 --- a/appconfig/tmux/bashconfig +++ b/appconfig/tmux/bashconfig @@ -40,6 +40,3 @@ runTmux() { } _trap_exit() { $TMUX_BIN kill-session -t "T$BASHPID"; } trap _trap_exit EXIT - - -[ $TERM != "screen" ] && TERM=xterm-256color && runTmux diff --git a/appconfig/tmux/install.sh b/appconfig/tmux/install.sh index 9689f42..f0b2f95 100755 --- a/appconfig/tmux/install.sh +++ b/appconfig/tmux/install.sh @@ -4,7 +4,7 @@ APP_PATH=`dirname "$0"` APP_PATH=`( cd "$APP_PATH" && pwd )` -sudo apt install tmux +sudo apt install tmux -y # symlink tmux settings rm ~/.tmux.conf diff --git a/install.sh b/install.sh index a068c22..8f40f1e 100755 --- a/install.sh +++ b/install.sh @@ -32,17 +32,21 @@ if [ $INSTALL_UNATTENDED -eq 0 ]; then clear fi +# colors in case of no toilet installed +PUR='\033[0;35m' # purple +NoC='\033[0m' # no color + #initialize submodules -toilet "Downloading git submodules" +toilet "Downloading git submodules" || echo -e "${PUR}Downloading git submodules${NoC}" git submodule update --init --recursive #update and upgrade current packages -toilet "Updating and Upgrading the system" +toilet "Updating and Upgrading the system" || echo -e "${PUR}Updating and Upgrading the system${NoC}" sudo apt-get -y update sudo apt-get -y upgrade #install essentials -toilet "Installing essentials" +toilet "Installing essentials" || echo -e "${PUR}Installing essentials${NoC}" sudo apt-get -y install build-essential make cmake cmake-curses-gui ccache pkg-config automake autoconf libc++-dev clang clang-format #install tools @@ -57,6 +61,12 @@ if [ $INSTALL_TMUX -eq 1 ]; then bash $APPCONFIG_PATH/tmux/install.sh fi +# install autorun tmux +if [ $INSTALL_TMUX_AUTOSTART -eq 1 ]; then + toilet "Autorun tmux" + echo '[ $TERM != "screen" ] && TERM=xterm-256color && runTmux' >> ~/.bashrc +fi + #install vim if [ $INSTALL_VIM -eq 1 ]; then toilet "Installing vim"