Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sshane committed Nov 23, 2021
1 parent b26f235 commit 055f023
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion emu.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
export COMMUNITY_PATH=/data/community
export COMMUNITY_BASHRC_PATH=${COMMUNITY_PATH}/.bashrc
export OH_MY_COMMA_PATH="/data/community/.oh-my-comma"
export OH_MY_COMMA_PATH=${COMMUNITY_PATH}/.oh-my-comma

source ${OH_MY_COMMA_PATH}/aliases.sh

Expand Down
12 changes: 5 additions & 7 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,27 @@ fi
touch ${COMMUNITY_PATH}/.bash_history
chmod 775 ${COMMUNITY_PATH}/.bash_history

# FIXME: is this only available on comma three?
if [ ! -d /data/community/.oh-my-zsh ] && [ $update = false ]; then
echo "Do you want to install zsh, .oh-my-zsh, and powerlevel10k? [You will also need to install nerd fonts on your local terminal. see: https://www.nerdfonts.com/font-downloads]"
echo "Do you want to install zsh, .oh-my-zsh, and powerlevel10k? [You will also need to install nerd fonts on your local terminal. See: https://www.nerdfonts.com/font-downloads]"
read -p "[y/N] > " choices
case ${choices} in
y|Y ) apt update && apt install zsh && zsh ${OH_MY_COMMA_PATH}/install-oh-my-zsh.zsh;;
* ) echo "Skipping...";;
esac
fi

printf "\n\033[92m"

CURRENT_BRANCH=$(cd ${OH_MY_COMMA_PATH} && git rev-parse --abbrev-ref HEAD)
if [ "${CURRENT_BRANCH}" != "master" ]; then
printf "\n❗ \033[0;31mWarning:\033[0m your current .oh-my-comma git branch is %s. If this is unintentional, run:\n\033[92mgit -C /data/community/.oh-my-comma checkout master\033[0m\n\n" "${CURRENT_BRANCH}"
fi

printf "\033[0m\n" # reset color
install_echo "Current version: $OMC_VERSION" # prints in update.sh

printf "\n\033[92m"
if [ $update = true ]; then
echo "Current version: $OMC_VERSION" # prints in update.sh
echo "✅ Successfully updated emu utilities!"
else
printf "\033[0mYou may want to exit out of this bash instance to automatically source emu\n"
echo "✅ Successfully installed emu utilities!"
printf "\033[0mYou may want to exit out of this bash instance to finish the install"
set +x
fi

0 comments on commit 055f023

Please sign in to comment.