Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions appconfig/tmux/bashconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ runTmux() {
}
_trap_exit() { $TMUX_BIN kill-session -t "T$BASHPID"; }
trap _trap_exit EXIT


[ $TERM != "screen" ] && TERM=xterm-256color && runTmux
2 changes: 1 addition & 1 deletion appconfig/tmux/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 13 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down