Compare commits
No commits in common. "39cb410c3e626cf35da029314380b9f51c68e855" and "dc984eb128835974f7a069d10dae2bb3f00e6409" have entirely different histories.
39cb410c3e
...
dc984eb128
@ -1,7 +1,4 @@
|
|||||||
command -v git &>/dev/null
|
GIT_FUNCTIONS=true
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
GIT_FUNCTIONS=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Spaced
|
# Spaced
|
||||||
#PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
|
#PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
|
||||||
@ -10,7 +7,7 @@ fi
|
|||||||
# another version I really like
|
# another version I really like
|
||||||
PS1="${PURPLE}\# ${LIGHTBLUE}{${LIGHTGREEN}\u${BROWN}@${LIGHTGREEN}\$(hostname --fqdn)${LIGHTBLUE}} ${LIGHTPURPLE}[${CYAN}\w${LIGHTPURPLE}] "
|
PS1="${PURPLE}\# ${LIGHTBLUE}{${LIGHTGREEN}\u${BROWN}@${LIGHTGREEN}\$(hostname --fqdn)${LIGHTBLUE}} ${LIGHTPURPLE}[${CYAN}\w${LIGHTPURPLE}] "
|
||||||
|
|
||||||
if [ $GIT_FUNCTIONS = "true" ]; then
|
if [ $GIT_FUNCTIONS ]; then
|
||||||
#PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
|
#PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
|
||||||
PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
|
PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
|
||||||
fi
|
fi
|
||||||
|
@ -1,14 +1,11 @@
|
|||||||
command -v git &>/dev/null
|
GIT_FUNCTIONS=true
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
GIT_FUNCTIONS=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Spaced
|
# Spaced
|
||||||
#PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
|
#PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
|
||||||
# Not spaced
|
# Not spaced
|
||||||
PS1="${LIGHTBLUE}[${LIGHTRED}\u${LIGHTBLUE}@${LIGHTBROWN}$(hostname --fqdn)${LIGHTBLUE}]${LIGHTPURPLE}(${GREEN}\w${LIGHTPURPLE})"
|
PS1="${LIGHTBLUE}[${LIGHTRED}\u${LIGHTBLUE}@${LIGHTBROWN}$(hostname --fqdn)${LIGHTBLUE}]${LIGHTPURPLE}(${GREEN}\w${LIGHTPURPLE})"
|
||||||
|
|
||||||
if [ $GIT_FUNCTIONS = "true" ]; then
|
if [ $GIT_FUNCTIONS ]; then
|
||||||
#PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
|
#PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
|
||||||
PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
|
PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
|
||||||
fi
|
fi
|
||||||
|
15
deploy.sh
15
deploy.sh
@ -6,9 +6,10 @@ CURRENT_FANCYFY=""
|
|||||||
DELETE=false
|
DELETE=false
|
||||||
MOVE=false
|
MOVE=false
|
||||||
PRESENT=false
|
PRESENT=false
|
||||||
|
BASHRC="~/.bashrc"
|
||||||
|
|
||||||
_bashrc_present() {
|
_bashrc_present() {
|
||||||
if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
|
if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ${BASHRC})" ]; then
|
||||||
echo true
|
echo true
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
@ -18,7 +19,7 @@ _bashrc_present() {
|
|||||||
_arguments() {
|
_arguments() {
|
||||||
if [ "$(_bashrc_present)" = true ]; then
|
if [ "$(_bashrc_present)" = true ]; then
|
||||||
PRESENT=true
|
PRESENT=true
|
||||||
CURRENT_FANCYFY="$(grep TERMINAL_FANCYFY ~/.bashrc | sed 's/.*=//')"
|
CURRENT_FANCYFY="$(grep TERMINAL_FANCYFY ${BASHRC} | sed 's/.*=//')"
|
||||||
fi
|
fi
|
||||||
for PARM in "$@"; do
|
for PARM in "$@"; do
|
||||||
if [ "${PARM}" = "--server" ]; then
|
if [ "${PARM}" = "--server" ]; then
|
||||||
@ -52,13 +53,13 @@ _help() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_delete() {
|
_delete() {
|
||||||
sed -i '/REF:bashrc_overrides:REF/{N;N;d}' ~/.bashrc
|
sed -i '/REF:bashrc_overrides:REF/{N;N;d}' "${BASHRC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
_bashrc_ref() {
|
_bashrc_ref() {
|
||||||
echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
|
echo "#REF:bashrc_overrides:REF" >> "${BASHRC}"
|
||||||
echo "export TERMINAL_FANCYFY=${1}" >> ~/.bashrc
|
echo "export TERMINAL_FANCYFY=${1}" >> "${BASHRC}"
|
||||||
echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
|
echo ". ${THIS}/bashrc_overrides/_all" >> "${BASHRC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
_move() {
|
_move() {
|
||||||
@ -86,7 +87,7 @@ _main() {
|
|||||||
fi
|
fi
|
||||||
elif [ "${PRESENT}" = true ]; then
|
elif [ "${PRESENT}" = true ]; then
|
||||||
if [ "${CURRENT_FANCYFY}" != "${FANCYFY}" ]; then
|
if [ "${CURRENT_FANCYFY}" != "${FANCYFY}" ]; then
|
||||||
sed -i "s/TERMINAL_FANCYFY=${CURRENT_FANCYFY}/TERMINAL_FANCYFY=${FANCYFY}/" ~/.bashrc
|
sed -i "s/TERMINAL_FANCYFY=${CURRENT_FANCYFY}/TERMINAL_FANCYFY=${FANCYFY}/" "${BASHRC}"
|
||||||
echo "customized fancyfying"
|
echo "customized fancyfying"
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user