From dfa6c56e897e252050abd651f9ccf9f54831397f Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Mon, 5 Nov 2018 11:28:42 +0100 Subject: [PATCH 01/25] Major change --- apply-colors.sh | 163 +++++++++++++++++++++++++++++++++++++----------- gogh.sh | 96 +++++++++++++++++++++++++--- 2 files changed, 211 insertions(+), 48 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index 1b40164..bdc362b 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -17,15 +17,15 @@ hexToDec () { } hexRGBtoDecRGB () { - R="$(hexToDec ${1:1:2})" - G="$(hexToDec ${1:3:2})" - B="$(hexToDec ${1:5:2})" + R="$(hexToDec "${1:1:2}")" + G="$(hexToDec "${1:3:2}")" + B="$(hexToDec "${1:5:2}")" echo "$R" "$G" "$B" } convertRGBtoMac () { - read R G B<<<$(hexRGBtoDecRGB $1) + read -r R G B<<<"$(hexRGBtoDecRGB "$1")" R=$(echo "${R} / 255" | bc -l) G=$(echo "${G} / 255" | bc -l) @@ -38,7 +38,7 @@ createMinttyEntry () { local name="$1" local colour="$2" - read R G B<<<$(hexRGBtoDecRGB $colour) + read -r R G B<<<"$(hexRGBtoDecRGB "$colour")" echo "$name=$R,$G,$B" } @@ -47,13 +47,13 @@ updateMinttyConfig () { local colour="$2" local name="$3" - echo "`cat "${config}" | grep -v -e "^${name}="`" > $config - echo -n "$(createMinttyEntry ${name} ${colour})" >> $config + echo "${config}" | grep -v -e "^${name}=" > "$config" + echo -n "$(createMinttyEntry "${name}" "${colour}")" >> "$config" } convertNameAndRGBtoITerm() { local name=$1 - read R G B<<<$(convertRGBtoMac $2) + read -r R G B<<<"$(convertRGBtoMac "$2")" echo "$1Blue Component${B}Green Component${G}Red Component${R}" } @@ -72,10 +72,11 @@ dset() { dlist_append() { local key="$1"; shift local val="$1"; shift - - local entries="$( + local entries + + entries="$( { - "$DCONF" read "$key" | tr -d '[]' | tr , "\n" | fgrep -v "$val" + "$DCONF" read "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" echo "'$val'" } | head -c-1 | tr "\n" , )" @@ -87,7 +88,7 @@ set_theme() { dset visible-name "'$PROFILE_NAME'" dset background-color "'${BACKGROUND_COLOR}'" dset foreground-color "'${FOREGROUND_COLOR}'" - if [ ! -z "${BOLD_COLOR}" ]; then + if [ -n "${BOLD_COLOR}" ]; then dset bold-color "'${BOLD_COLOR}'" dset bold-color-same-as-fg "false" else @@ -98,22 +99,6 @@ set_theme() { dset use-theme-background "false" } - -# | -# | Check for the terminal name (depening on os) -# | =========================================== -OS=$(uname) -if [ "$OS" = "Darwin" ]; then - # | - # | Check for the terminal name and decide how to apply - # | =========================================== - TERMINAL=$TERM_PROGRAM -elif [ "${OS#CYGWIN}" != "${OS}" ]; then - TERMINAL="mintty" -else - TERMINAL="$(ps -p $(ps -p $(ps -p $$ -o ppid=) -o ppid=) -o args=)" -fi - # | # | Apply color scheme to terminal # | =========================================== @@ -181,9 +166,9 @@ elif [ "$TERMINAL" = "mate-terminal" ]; then PROFILE_DIR="$BASE_DIR/profiles" if [[ -n "$($DCONF read $BASE_DIR/global/default-profile)" ]]; then - DEFAULT_SLUG=$($DCONF read $BASE_DIR/global/default-profile | tr -d \') + DEFAULT_SLUG=$($DCONF read $BASE_DIR/global/default-profile | tr -d "'") else - DEFAULT_SLUG=$($DCONF list $PROFILE_DIR/ | head -n1 | tr -d \/) + DEFAULT_SLUG=$($DCONF list $PROFILE_DIR/ | head -n1 | tr -d "/") fi DEFAULT_KEY="$PROFILE_DIR/$DEFAULT_SLUG" @@ -254,6 +239,107 @@ elif [ "$TERMINAL" = "io.elementary.terminal" ]; then gsettings set io.elementary.terminal.settings cursor-color "${CURSOR_COLOR}" gsettings set io.elementary.terminal.settings palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" +elif [ "$TERMINAL" = "tilix" ]; then + # | + # | Applying values to tilix + # | =========================================== + BACKGROUND_COLOR=$(gnome_color "$BACKGROUND_COLOR") + FOREGROUND_COLOR=$(gnome_color "$FOREGROUND_COLOR") + COLOR_01=$(gnome_color "$COLOR_01") + COLOR_02=$(gnome_color "$COLOR_02") + COLOR_03=$(gnome_color "$COLOR_03") + COLOR_04=$(gnome_color "$COLOR_04") + COLOR_05=$(gnome_color "$COLOR_05") + COLOR_06=$(gnome_color "$COLOR_06") + COLOR_07=$(gnome_color "$COLOR_07") + COLOR_08=$(gnome_color "$COLOR_08") + COLOR_09=$(gnome_color "$COLOR_09") + COLOR_10=$(gnome_color "$COLOR_10") + COLOR_11=$(gnome_color "$COLOR_11") + COLOR_12=$(gnome_color "$COLOR_12") + COLOR_13=$(gnome_color "$COLOR_13") + COLOR_14=$(gnome_color "$COLOR_14") + COLOR_15=$(gnome_color "$COLOR_15") + COLOR_16=$(gnome_color "$COLOR_16") + + # | + # | Apply Variables + # | =========================================== + + + [[ -z "$PROFILE_NAME" ]] && PROFILE_NAME="Default" + [[ -z "$PROFILE_SLUG" ]] && PROFILE_SLUG="Default" + [[ -z "$DCONF" ]] && DCONF=dconf + [[ -z "$UUIDGEN" ]] && UUIDGEN=uuidgen + + [[ -z "$BASE_KEY_NEW" ]] && BASE_KEY_NEW=/com/gexperts/Tilix/profiles + + if [[ -n "$($DCONF list $BASE_KEY_NEW/)" ]]; then + if command -v "$UUIDGEN" > /dev/null 2>&1; then + PROFILE_SLUG=$(uuidgen) + fi + + if [[ -n "$($DCONF read $BASE_KEY_NEW/default)" ]]; then + DEFAULT_SLUG=$($DCONF read $BASE_KEY_NEW/default | tr -d "'") + else + DEFAULT_SLUG=$($DCONF list $BASE_KEY_NEW/ | grep '\/$' | head -n1 | tr -d "/") + fi + + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + [[ -d "$HOME/.config/tilix/schemes" ]] || mkdir -p "$HOME/.config/tilix/schemes" + + TILIXCOLORS='{\n\t"background-color":"'${BACKGROUND_COLOR}'",\n\t"badge-color": "#FFFFFF",\n\t"bold-color": "#FFFFFF",\n\t"comment": "Generated by Gogh",\n\t"cursor-background-color": "#000000",\n\t"cursor-foreground-color": "'${CURSOR_COLOR}'",\n\t"foreground-color": "#FFFFFF",\n\t"highlight-background-color": "#000000",\n\t"highlight-foreground-color": "#FFFFFF",\n\t"name": "'${PROFILE_NAME}'",\n\t"palette": [\n\t\t"'${COLOR_01}'",\n\t\t"'${COLOR_02}'",\n\t\t"'${COLOR_03}'",\n\t\t"'${COLOR_04}'",\n\t\t"'${COLOR_05}'",\n\t\t"'${COLOR_06}'",\n\t\t"'${COLOR_07}'",\n\t\t"'${COLOR_08}'",\n\t\t"'${COLOR_09}'",\n\t\t"'${COLOR_10}'",\n\t\t"'${COLOR_11}'",\n\t\t"'${COLOR_12}'",\n\t\t"'${COLOR_13}'",\n\t\t"'${COLOR_14}'",\n\t\t"'${COLOR_15}'",\n\t\t"'${COLOR_16}'"\n\t],\n\t"use-badge-color": false,\n\t"use-bold-color": false,\n\t"use-cursor-color": false,\n\t"use-highlight-color": false,\n\t"use-theme-colors": false\n}' + echo -e "$TILIXCOLORS" > "$scratchdir/${PROFILE_NAME}.json" + + # Note: Tilix does not store color scheme name in dconf + # so we have to update color palette for the current profile in order to switch to the new theme + # but only set the palette on the last loop to avoid a flashing terminal + if ((LOOP == OPTLENGTH)); then + cp -f "$scratchdir/*" "$HOME/.config/tilix/schemes/" + rm -rf "$scratchdir" + PROFILE_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" + PROFILE_NAME=$($DCONF read $PROFILE_KEY/visible-name | tr -d "'") + read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + set_theme + dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" + fi + fi + + unset PROFILE_NAME + unset PROFILE_SLUG + unset DCONF + unset UUIDGEN + unset TILIXCOLORS + exit 0 + fi + + DEFAULT_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" + PROFILE_KEY="$BASE_KEY_NEW/$PROFILE_SLUG" + + # copy existing settings from default profile + $DCONF dump "$DEFAULT_KEY/" | $DCONF load "$PROFILE_KEY/" + + # add new copy to list of profiles + dlist_append "$BASE_KEY_NEW/list" "$PROFILE_SLUG" + + # update profile values with theme options + set_theme + dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" + + unset PROFILE_NAME + unset PROFILE_SLUG + unset DCONF + unset UUIDGEN + exit 0 + else + # provide a user friendly error text if no saved profile exists, otherwise it will display "Error gconftool not found!" + # it could happen on a newly installed system. (happened on CentOS 7) + echo "Error, no saved profiles found!" + echo "Possible fix, new a profile (Terminal > Settings > New profile, then Close) and try again." + echo "You can safely delete the created profile after the installation." + exit 1 + fi else # | # | Applying values on gnome-terminal @@ -288,18 +374,18 @@ else [[ -z "$UUIDGEN" ]] && UUIDGEN=uuidgen # Newest versions of gnome-terminal use dconf - if which "$DCONF" > /dev/null 2>&1; then + if command -v "$DCONF" > /dev/null 2>&1; then [[ -z "$BASE_KEY_NEW" ]] && BASE_KEY_NEW=/org/gnome/terminal/legacy/profiles: if [[ -n "$($DCONF list $BASE_KEY_NEW/)" ]]; then - if which "$UUIDGEN" > /dev/null 2>&1; then + if command -v "$UUIDGEN" > /dev/null 2>&1; then PROFILE_SLUG=$(uuidgen) fi if [[ -n "$($DCONF read $BASE_KEY_NEW/default)" ]]; then - DEFAULT_SLUG=$($DCONF read $BASE_KEY_NEW/default | tr -d \') + DEFAULT_SLUG=$($DCONF read $BASE_KEY_NEW/default | tr -d "'") else - DEFAULT_SLUG=$($DCONF list $BASE_KEY_NEW/ | grep '^:' | head -n1 | tr -d :/) + DEFAULT_SLUG=$($DCONF list $BASE_KEY_NEW/ | grep '^:' | head -n1 | tr -d ":/") fi DEFAULT_KEY="$BASE_KEY_NEW/:$DEFAULT_SLUG" @@ -334,8 +420,8 @@ else # error handling on gconftool if [[ -z "$GCONFTOOL" ]]; then - GCONFTOOL=$(which gconftool 2>/dev/null) - if [[ "$?" -ne 0 ]]; then + GCONFTOOL=$(command -v gconftool 2>/dev/null) + if [[ GCONFTOOL -ne 0 ]]; then echo "Error gconftool not found!" echo "Possible fix, enter the following and run again:" echo "export GCONFTOOL=/path/to/gconftool/" @@ -360,10 +446,11 @@ else local type="$1"; shift local key="$1"; shift local val="$1"; shift + local entries - local entries="$( + entries="$( { - "$GCONFTOOL" --get "$key" | tr -d '[]' | tr , "\n" | fgrep -v "$val" + "$GCONFTOOL" --get "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" echo "$val" } | head -c-1 | tr "\n" , )" diff --git a/gogh.sh b/gogh.sh index fb909b7..2d2bbf4 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# Handle errors gracefully +set -euo pipefail + declare -a THEMES=( '3024-day.sh' '3024-night.sh' @@ -165,8 +168,24 @@ declare -a THEMES=( 'wombat.sh' 'wryan.sh' 'zenburn.sh' + 'google-light.sh' + 'google-dark.sh' ) + +cleanup() { + echo + echo "Caught signal..$? Cleaning up" + rm -rf "$scratchdir" + echo "Done..." + exit 1 +} + +scratchdir=$(mktemp -d -t tmp.XXXXXXXX) +export scratchdir +trap cleanup SIGHUP SIGINT SIGQUIT SIGABRT + + capitalize() { local ARGUMENT=$1 local RES="" @@ -184,7 +203,8 @@ capitalize() { } curlsource() { - local F=$(mktemp -t curlsource) + local F + F=$(mktemp -t curlsource) curl -o "$F" -s -L "$1" source "$F" rm -f "$F" @@ -197,12 +217,20 @@ set_gogh() { result=$(capitalize "${string_s}") url="https://raw.githubusercontent.com/Mayccoll/Gogh/master/themes/$1" - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl - # Note: sourcing directly from curl does not work - export {PROFILE_NAME,PROFILE_SLUG}="$result" && curlsource "${url}" + export {PROFILE_NAME,PROFILE_SLUG}="$result" + + # Evaluate if Gogh was called from local source - i.e cloned repo + SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [ -e "$SCRIPT_PATH/themes/$1" ]; then + bash "$SCRIPT_PATH/themes/$1" else - export {PROFILE_NAME,PROFILE_SLUG}="$result" && bash <(wget -O - "${url}") + if [ "$(uname)" = "Darwin" ]; then + # OSX ships with curl + # Note: sourcing directly from curl does not work + curlsource "${url}" + else + bash <(wget -O - "${url}") + fi fi } @@ -244,14 +272,63 @@ done # | echo -e "\nUsage : Enter Desired Themes Numbers (\\033[0m\033[0;34mOPTIONS\\033[0m\033[0m) Separated By A Blank Space" echo -e " Press \033[0;34mENTER\\033[0m without options to Exit\n" -read -p 'Enter OPTION(S) : ' -a OPTION +read -r -p 'Enter OPTION(S) : ' -a OPTION +# | +# | ::::::: Get terminal +# | +# | +# | Check for the terminal name (depening on os) +# | =========================================== +OS=$(uname) +if [ "$OS" = "Darwin" ]; then + # | + # | Check for the terminal name and decide how to apply + # | =========================================== + TERMINAL=$TERM_PROGRAM +elif [ "${OS#CYGWIN}" != "${OS}" ]; then + TERMINAL="mintty" +else + # | + # | Depending on how the script was invoked, we need + # | to loop until pid is no longer a subshell + # | =========================================== + pid="$$" + TERMINAL="$(ps -h -o comm -p $pid)" + while [[ "${TERMINAL:(-2)}" == "sh" ]]; do + pid="$(ps -h -o ppid -p $pid)" + TERMINAL="$(ps -h -o comm -p $pid)" + done +fi + +# | +# | Tilix supports fg/bg in color schemes - ask wether user wants to go that route +# | This is to avoid creating multiple profiles just for colors +# | =========================================== +if [[ "$TERMINAL" = "tilix" ]]; then + echo + read -r -p "Tilix detected - use color schemes instead of profiles? [y/N] " -n 1 TILIX_RES + echo +fi + +# | +# | ::::::: Export one-off variables +# | +[[ -v TILIX_RES ]] && export TILIX_RES +export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} + # | # | ::::::: Apply Theme # | -for OP in "${OPTION[@]}"; do + # Note: + # Constants with a leading 0 are interpreted as octal numbers + # Hence option 08 and 09 will not work + # Solution is to remove the leading 0 from the parsed options +for OP in "${OPTION[@]#0}"; do + # See Tilix section in apply-colors.sh for usage of LOOP + LOOP=$((${LOOP:-0}+1)) if [[ OP -le ARRAYLENGTH && OP -gt 0 ]]; then FILENAME=$(remove_file_extension "${THEMES[((OP-1))]}") @@ -264,5 +341,4 @@ for OP in "${OPTION[@]}"; do echo -e "\\033[0m\033[0;31m ~ INVALID OPTION! ~\\033[0m\033[0m" exit 1 fi - -done +done \ No newline at end of file From a453f6a34d75ac0f1082de7175bf693d8549507d Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 00:00:17 +0100 Subject: [PATCH 02/25] Major update with tilix support --- README.md | 4 +-- apply-colors.sh | 34 +++++++++++++++++------- gogh.sh | 30 +++++++++++++++++---- themes/3024-day.sh | 1 - themes/3024-night.sh | 1 - themes/_base.sh | 1 - themes/aci.sh | 2 -- themes/aco.sh | 2 -- themes/adventuretime.sh | 1 - themes/afterglow.sh | 1 - themes/alien-blood.sh | 1 - themes/argonaut.sh | 1 - themes/arthur.sh | 1 - themes/atom.sh | 1 - themes/azu.sh | 2 -- themes/belafonte-day.sh | 1 - themes/belafonte-night.sh | 1 - themes/bim.sh | 2 -- themes/birds-of-paradise.sh | 1 - themes/blazer.sh | 1 - themes/borland.sh | 1 - themes/broadcast.sh | 1 - themes/brogrammer.sh | 1 - themes/c64.sh | 1 - themes/cai.sh | 2 -- themes/chalk.sh | 2 -- themes/chalkboard.sh | 1 - themes/ciapre.sh | 1 - themes/clone-of-ubuntu.sh | 1 - themes/clrs.sh | 1 - themes/cobalt-neon.sh | 1 - themes/cobalt2.sh | 1 - themes/crayon-pony-fish.sh | 1 - themes/dark-pastel.sh | 1 - themes/darkside.sh | 1 - themes/desert.sh | 1 - themes/dimmed-monokai.sh | 1 - themes/dracula.sh | 2 -- themes/earthsong.sh | 1 - themes/elemental.sh | 1 - themes/elementary.sh | 2 -- themes/elic.sh | 2 -- themes/elio.sh | 2 -- themes/espresso-libre.sh | 1 - themes/espresso.sh | 1 - themes/fishtank.sh | 1 - themes/flat.sh | 2 -- themes/flatland.sh | 1 - themes/foxnightly.sh | 2 -- themes/freya.sh | 2 -- themes/frontend-delight.sh | 1 - themes/frontend-fun-forrest.sh | 1 - themes/frontend-galaxy.sh | 1 - themes/github.sh | 1 - themes/gooey.sh | 1 - themes/grape.sh | 1 - themes/grass.sh | 1 - themes/gruvbox-dark.sh | 2 -- themes/gruvbox.sh | 1 - themes/hardcore.sh | 1 - themes/harper.sh | 1 - themes/hemisu-dark.sh | 2 -- themes/hemisu-light.sh | 2 -- themes/highway.sh | 1 - themes/hipster-green.sh | 1 - themes/homebrew.sh | 1 - themes/hurtado.sh | 1 - themes/hybrid.sh | 2 -- themes/ic-green-ppl.sh | 1 - themes/ic-orange-ppl.sh | 1 - themes/idle-toes.sh | 1 - themes/ir-black.sh | 2 -- themes/jackie-brown.sh | 1 - themes/japanesque.sh | 1 - themes/jellybeans.sh | 1 - themes/jup.sh | 2 -- themes/kibble.sh | 1 - themes/later-this-evening.sh | 1 - themes/lavandula.sh | 1 - themes/liquid-carbon-transparent.sh | 1 - themes/liquid-carbon.sh | 1 - themes/man-page.sh | 1 - themes/mar.sh | 2 -- themes/material.sh | 2 -- themes/mathias.sh | 1 - themes/medallion.sh | 1 - themes/misterioso.sh | 1 - themes/miu.sh | 2 -- themes/molokai.sh | 1 - themes/mona-lisa.sh | 1 - themes/monokai-dark.sh | 2 -- themes/monokai-soda.sh | 1 - themes/n0tch2k.sh | 1 - themes/neopolitan.sh | 1 - themes/nep.sh | 2 -- themes/neutron.sh | 1 - themes/nightlion-v1.sh | 1 - themes/nightlion-v2.sh | 1 - themes/nighty.sh | 1 - themes/nord-light.sh | 2 -- themes/nord.sh | 2 -- themes/novel.sh | 1 - themes/obsidian.sh | 1 - themes/ocean-dark.sh | 2 -- themes/ocean.sh | 1 - themes/oceanic-next.sh | 1 - themes/ollie.sh | 1 - themes/one-dark.sh | 2 -- themes/one-half-black.sh | 2 -- themes/one-light.sh | 2 -- themes/pali.sh | 2 -- themes/paraiso-dark.sh | 1 - themes/paul-millr.sh | 1 - themes/pencil-dark.sh | 1 - themes/pencil-light.sh | 1 - themes/peppermint.sh | 2 -- themes/pnevma.sh | 1 - themes/pro.sh | 1 - themes/red-alert.sh | 1 - themes/red-sands.sh | 1 - themes/rippedcasts.sh | 1 - themes/royal.sh | 1 - themes/sat.sh | 2 -- themes/sea-shells.sh | 1 - themes/seafoam-pastel.sh | 1 - themes/seti.sh | 1 - themes/shaman.sh | 1 - themes/shel.sh | 2 -- themes/slate.sh | 1 - themes/smyck.sh | 2 -- themes/snazzy.sh | 2 -- themes/soft-server.sh | 1 - themes/solarized-darcula.sh | 1 - themes/solarized-dark-higher-contrast.sh | 1 - themes/solarized-dark.sh | 2 -- themes/solarized-light.sh | 2 -- themes/spacedust.sh | 1 - themes/spacegray-eighties-dull.sh | 1 - themes/spacegray-eighties.sh | 1 - themes/spacegray.sh | 1 - themes/spring.sh | 1 - themes/square.sh | 1 - themes/srcery.sh | 2 -- themes/sundried.sh | 1 - themes/symphonic.sh | 1 - themes/teerb.sh | 1 - themes/terminal-basic.sh | 1 - themes/terminix-dark.sh | 1 - themes/thayer-bright.sh | 1 - themes/tin.sh | 2 -- themes/tomorrow-night-blue.sh | 2 -- themes/tomorrow-night-bright.sh | 2 -- themes/tomorrow-night-eighties.sh | 2 -- themes/tomorrow-night.sh | 2 -- themes/tomorrow.sh | 2 -- themes/toy-chest.sh | 1 - themes/treehouse.sh | 1 - themes/twilight.sh | 1 - themes/ura.sh | 2 -- themes/urple.sh | 1 - themes/vag.sh | 10 +++---- themes/vaughn.sh | 1 - themes/vibrant-ink.sh | 1 - themes/warm-neon.sh | 1 - themes/wez.sh | 1 - themes/wild-cherry.sh | 1 - themes/wombat.sh | 1 - themes/wryan.sh | 1 - themes/zenburn.sh | 1 - 169 files changed, 55 insertions(+), 234 deletions(-) diff --git a/README.md b/README.md index 18fa1ce..845900d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Gogh ![elementary](https://raw.githubusercontent.com/Mayccoll/Gogh/master/images/gogh/Gogh-icons.png) -## Color Scheme for Gnome Terminal and Pantheon Terminal +## Color Scheme for Gnome Terminal, Pantheon Terminal and Tilix -Color Schemes For Ubuntu, Linux Mint, Elementary OS and all distributions that use gnome terminal or Pantheon Terminal, initially inspired by Elementary OS Luna. Also work on iTerm for macOS. You can check some themes [here...](https://mayccoll.github.io/Gogh/) +Color Schemes For Ubuntu, Linux Mint, Elementary OS and all distributions that use gnome terminal, Pantheon Terminal or Tilix, initially inspired by Elementary OS Luna. Also work on iTerm for macOS. You can check some themes [here...](https://mayccoll.github.io/Gogh/) ![elementary](https://raw.githubusercontent.com/Mayccoll/Gogh/master/images/demos/themes.gif) diff --git a/apply-colors.sh b/apply-colors.sh index c204e01..90ee098 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -25,7 +25,8 @@ hexRGBtoDecRGB () { } convertRGBtoMac () { - read -r R G B<<<"$(hexRGBtoDecRGB "$1")" + set -- $(hexRGBtoDecRGB "$1") + R=$1; shift; G=$1; shift; B=$1; shift R=$(echo "${R} / 255" | bc -l) G=$(echo "${G} / 255" | bc -l) @@ -37,8 +38,10 @@ convertRGBtoMac () { createMinttyEntry () { local name="$1" local colour="$2" + set -- + set -- $(hexRGBtoDecRGB "$colour") + R=$1; shift; G=$1; shift; B=$1; shift - read -r R G B<<<"$(hexRGBtoDecRGB "$colour")" echo "$name=$R,$G,$B" } @@ -52,8 +55,12 @@ updateMinttyConfig () { } convertNameAndRGBtoITerm() { - local name=$1 - read -r R G B<<<"$(convertRGBtoMac "$2")" + local name="$1" + local colour="$2" + set -- + set -- $(convertRGBtoMac "$colour") + R=$1; shift; G=$1; shift; B=$1; shift + echo "$1Blue Component${B}Green Component${G}Red Component${R}" } @@ -99,6 +106,14 @@ set_theme() { dset use-theme-background "false" } +# | +# | Print theme colors +# | =========================================== +if command -v gogh_truecolor > /dev/null; then + gogh_truecolor +else + gogh_colors +fi # | # | Apply color scheme to terminal @@ -287,21 +302,23 @@ elif [ "$TERMINAL" = "tilix" ]; then fi if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - [[ -d "$HOME/.config/tilix/schemes" ]] || mkdir -p "$HOME/.config/tilix/schemes" + [[ -d "$HOME/.config/tilix/schemes" ]] || mkdir -p "${HOME}/.config/tilix/schemes" TILIXCOLORS='{\n\t"background-color":"'${BACKGROUND_COLOR}'",\n\t"badge-color": "#FFFFFF",\n\t"bold-color": "#FFFFFF",\n\t"comment": "Generated by Gogh",\n\t"cursor-background-color": "#000000",\n\t"cursor-foreground-color": "'${CURSOR_COLOR}'",\n\t"foreground-color": "#FFFFFF",\n\t"highlight-background-color": "#000000",\n\t"highlight-foreground-color": "#FFFFFF",\n\t"name": "'${PROFILE_NAME}'",\n\t"palette": [\n\t\t"'${COLOR_01}'",\n\t\t"'${COLOR_02}'",\n\t\t"'${COLOR_03}'",\n\t\t"'${COLOR_04}'",\n\t\t"'${COLOR_05}'",\n\t\t"'${COLOR_06}'",\n\t\t"'${COLOR_07}'",\n\t\t"'${COLOR_08}'",\n\t\t"'${COLOR_09}'",\n\t\t"'${COLOR_10}'",\n\t\t"'${COLOR_11}'",\n\t\t"'${COLOR_12}'",\n\t\t"'${COLOR_13}'",\n\t\t"'${COLOR_14}'",\n\t\t"'${COLOR_15}'",\n\t\t"'${COLOR_16}'"\n\t],\n\t"use-badge-color": false,\n\t"use-bold-color": false,\n\t"use-cursor-color": false,\n\t"use-highlight-color": false,\n\t"use-theme-colors": false\n}' - echo -e "$TILIXCOLORS" > "$scratchdir/${PROFILE_NAME}.json" + echo -e "$TILIXCOLORS" > "${scratchdir}/${PROFILE_NAME}.json" # Note: Tilix does not store color scheme name in dconf # so we have to update color palette for the current profile in order to switch to the new theme # but only set the palette on the last loop to avoid a flashing terminal if ((LOOP == OPTLENGTH)); then - cp -f "$scratchdir/*" "$HOME/.config/tilix/schemes/" - rm -rf "$scratchdir" + cp -f "$scratchdir"/* "$HOME/.config/tilix/schemes/" + rm -rf "${scratchdir}" PROFILE_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" PROFILE_NAME=$($DCONF read $PROFILE_KEY/visible-name | tr -d "'") read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + PROFILE_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" + PROFILE_NAME=$($DCONF read $PROFILE_KEY/visible-name | tr -d "'") set_theme dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" fi @@ -475,5 +492,4 @@ else unset PROFILE_SLUG unset DCONF unset UUIDGEN - fi diff --git a/gogh.sh b/gogh.sh index 23038c8..fd6afe9 100755 --- a/gogh.sh +++ b/gogh.sh @@ -54,6 +54,8 @@ declare -a THEMES=( 'frontend-fun-forrest.sh' 'frontend-galaxy.sh' 'github.sh' + 'google-dark.sh' + 'google-light.sh' 'gooey.sh' 'grape.sh' 'grass.sh' @@ -169,8 +171,6 @@ declare -a THEMES=( 'wombat.sh' 'wryan.sh' 'zenburn.sh' - 'google-light.sh' - 'google-dark.sh' ) @@ -178,13 +178,14 @@ cleanup() { echo echo "Caught signal..$? Cleaning up" rm -rf "$scratchdir" + unset TERMINAL TRUECOLOR LOOP OPTLENGTH echo "Done..." - exit 1 + exit 0 } scratchdir=$(mktemp -d -t tmp.XXXXXXXX) export scratchdir -trap cleanup SIGHUP SIGINT SIGQUIT SIGABRT +trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM capitalize() { @@ -313,11 +314,30 @@ if [[ "$TERMINAL" = "tilix" ]]; then echo fi +# | +# | If terminal supports truecolor then we can show theme colors without applying the theme +# | =========================================== +if [[ "$COLORTERM" == "truecolor" ]] || [[ "$COLORTERM" == "24bit" ]]; then + # This function gets called in apply-colors.sh instead of gogh_colors + # Calls to gogh_colors has also been move to apply-colors.sh to avoid printing twice + function gogh_truecolor () { + echo + for c in {01..16}; do + local color="COLOR_$c" + set -- $(hexRGBtoDecRGB "${!color}") + echo -ne "\033[38;2;${1};${2};${3}m█████" + [[ "$c" == "08" ]] && echo # new line + done + echo + } + export -f gogh_truecolor +fi + # | # | ::::::: Export one-off variables # | [[ -v TILIX_RES ]] && export TILIX_RES -export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} +export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} # | # | ::::::: Apply Theme diff --git a/themes/3024-day.sh b/themes/3024-day.sh index 8c1b43a..0e6ed27 100755 --- a/themes/3024-day.sh +++ b/themes/3024-day.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/3024-night.sh b/themes/3024-night.sh index a94bdf9..7d3f89d 100755 --- a/themes/3024-night.sh +++ b/themes/3024-night.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/_base.sh b/themes/_base.sh index ebab783..b75e2b4 100755 --- a/themes/_base.sh +++ b/themes/_base.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ] then diff --git a/themes/aci.sh b/themes/aci.sh index a69a83a..429e5c7 100755 --- a/themes/aci.sh +++ b/themes/aci.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/aco.sh b/themes/aco.sh index eab5c66..40bd595 100755 --- a/themes/aco.sh +++ b/themes/aco.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/adventuretime.sh b/themes/adventuretime.sh index 48fc643..15c6bcc 100755 --- a/themes/adventuretime.sh +++ b/themes/adventuretime.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/afterglow.sh b/themes/afterglow.sh index b64b163..8657336 100755 --- a/themes/afterglow.sh +++ b/themes/afterglow.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/alien-blood.sh b/themes/alien-blood.sh index 0b34c25..e997fa0 100755 --- a/themes/alien-blood.sh +++ b/themes/alien-blood.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/argonaut.sh b/themes/argonaut.sh index ab80ba0..78f4cf4 100755 --- a/themes/argonaut.sh +++ b/themes/argonaut.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/arthur.sh b/themes/arthur.sh index c312089..39c3ef0 100755 --- a/themes/arthur.sh +++ b/themes/arthur.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/atom.sh b/themes/atom.sh index 12c36f8..0889cfa 100755 --- a/themes/atom.sh +++ b/themes/atom.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/azu.sh b/themes/azu.sh index e500e8b..759a294 100755 --- a/themes/azu.sh +++ b/themes/azu.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/belafonte-day.sh b/themes/belafonte-day.sh index 9d19507..ffc1355 100755 --- a/themes/belafonte-day.sh +++ b/themes/belafonte-day.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/belafonte-night.sh b/themes/belafonte-night.sh index c9d9565..5facaaa 100755 --- a/themes/belafonte-night.sh +++ b/themes/belafonte-night.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/bim.sh b/themes/bim.sh index cc4f043..b0bf219 100755 --- a/themes/bim.sh +++ b/themes/bim.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/birds-of-paradise.sh b/themes/birds-of-paradise.sh index 2d3e96a..ceb1538 100755 --- a/themes/birds-of-paradise.sh +++ b/themes/birds-of-paradise.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/blazer.sh b/themes/blazer.sh index 57d94c5..379968f 100755 --- a/themes/blazer.sh +++ b/themes/blazer.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/borland.sh b/themes/borland.sh index aa67540..a9ab2df 100755 --- a/themes/borland.sh +++ b/themes/borland.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/broadcast.sh b/themes/broadcast.sh index e471ca2..c400767 100755 --- a/themes/broadcast.sh +++ b/themes/broadcast.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/brogrammer.sh b/themes/brogrammer.sh index ae439cc..83e7a5f 100755 --- a/themes/brogrammer.sh +++ b/themes/brogrammer.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/c64.sh b/themes/c64.sh index afcaf2d..81c1fd5 100755 --- a/themes/c64.sh +++ b/themes/c64.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/cai.sh b/themes/cai.sh index 6b01d5e..e095dd6 100755 --- a/themes/cai.sh +++ b/themes/cai.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/chalk.sh b/themes/chalk.sh index 21342de..b45b10f 100755 --- a/themes/chalk.sh +++ b/themes/chalk.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/chalkboard.sh b/themes/chalkboard.sh index 56c56c8..cac0472 100755 --- a/themes/chalkboard.sh +++ b/themes/chalkboard.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ciapre.sh b/themes/ciapre.sh index d200509..0b664cc 100755 --- a/themes/ciapre.sh +++ b/themes/ciapre.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/clone-of-ubuntu.sh b/themes/clone-of-ubuntu.sh index 140c8b3..21f83af 100755 --- a/themes/clone-of-ubuntu.sh +++ b/themes/clone-of-ubuntu.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ] then diff --git a/themes/clrs.sh b/themes/clrs.sh index 4fd067a..fb01cba 100755 --- a/themes/clrs.sh +++ b/themes/clrs.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/cobalt-neon.sh b/themes/cobalt-neon.sh index fe38b45..828436f 100755 --- a/themes/cobalt-neon.sh +++ b/themes/cobalt-neon.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/cobalt2.sh b/themes/cobalt2.sh index 9abec7d..cc20fb6 100755 --- a/themes/cobalt2.sh +++ b/themes/cobalt2.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/crayon-pony-fish.sh b/themes/crayon-pony-fish.sh index 599f4cb..87e30c4 100755 --- a/themes/crayon-pony-fish.sh +++ b/themes/crayon-pony-fish.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/dark-pastel.sh b/themes/dark-pastel.sh index 228aa79..b665617 100755 --- a/themes/dark-pastel.sh +++ b/themes/dark-pastel.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/darkside.sh b/themes/darkside.sh index 164ee42..b0b1986 100755 --- a/themes/darkside.sh +++ b/themes/darkside.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/desert.sh b/themes/desert.sh index c3701f2..b51ca6c 100755 --- a/themes/desert.sh +++ b/themes/desert.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/dimmed-monokai.sh b/themes/dimmed-monokai.sh index f5f9761..fe1e592 100755 --- a/themes/dimmed-monokai.sh +++ b/themes/dimmed-monokai.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/dracula.sh b/themes/dracula.sh index 79d262c..85a2476 100755 --- a/themes/dracula.sh +++ b/themes/dracula.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/earthsong.sh b/themes/earthsong.sh index ed6d6e1..fa831d8 100755 --- a/themes/earthsong.sh +++ b/themes/earthsong.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/elemental.sh b/themes/elemental.sh index ac3a932..f6f7a2d 100755 --- a/themes/elemental.sh +++ b/themes/elemental.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/elementary.sh b/themes/elementary.sh index 8e65cfa..dce129e 100755 --- a/themes/elementary.sh +++ b/themes/elementary.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/elic.sh b/themes/elic.sh index 36c34a4..e165f5f 100755 --- a/themes/elic.sh +++ b/themes/elic.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/elio.sh b/themes/elio.sh index c1100f2..145dcd6 100755 --- a/themes/elio.sh +++ b/themes/elio.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/espresso-libre.sh b/themes/espresso-libre.sh index 154faf7..33fd34d 100755 --- a/themes/espresso-libre.sh +++ b/themes/espresso-libre.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/espresso.sh b/themes/espresso.sh index 1bab940..95904a9 100755 --- a/themes/espresso.sh +++ b/themes/espresso.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/fishtank.sh b/themes/fishtank.sh index 6205e4a..26158c5 100755 --- a/themes/fishtank.sh +++ b/themes/fishtank.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/flat.sh b/themes/flat.sh index c77209c..a8812e3 100755 --- a/themes/flat.sh +++ b/themes/flat.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/flatland.sh b/themes/flatland.sh index 26ac8b7..867b04b 100755 --- a/themes/flatland.sh +++ b/themes/flatland.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/foxnightly.sh b/themes/foxnightly.sh index 5c74348..1f18201 100755 --- a/themes/foxnightly.sh +++ b/themes/foxnightly.sh @@ -54,11 +54,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/freya.sh b/themes/freya.sh index 34d211b..d22f9fb 100755 --- a/themes/freya.sh +++ b/themes/freya.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/frontend-delight.sh b/themes/frontend-delight.sh index 6b9a0fc..d20b571 100755 --- a/themes/frontend-delight.sh +++ b/themes/frontend-delight.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/frontend-fun-forrest.sh b/themes/frontend-fun-forrest.sh index 8327136..1b6cccf 100755 --- a/themes/frontend-fun-forrest.sh +++ b/themes/frontend-fun-forrest.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/frontend-galaxy.sh b/themes/frontend-galaxy.sh index b6a9caf..77a358b 100755 --- a/themes/frontend-galaxy.sh +++ b/themes/frontend-galaxy.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/github.sh b/themes/github.sh index a7ef740..652f979 100755 --- a/themes/github.sh +++ b/themes/github.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/gooey.sh b/themes/gooey.sh index fba918e..2cc613b 100755 --- a/themes/gooey.sh +++ b/themes/gooey.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ] then diff --git a/themes/grape.sh b/themes/grape.sh index 47dc675..981da1a 100755 --- a/themes/grape.sh +++ b/themes/grape.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/grass.sh b/themes/grass.sh index 9a9b5e6..d44f0e9 100755 --- a/themes/grass.sh +++ b/themes/grass.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/gruvbox-dark.sh b/themes/gruvbox-dark.sh index c63ffc9..8c01c61 100755 --- a/themes/gruvbox-dark.sh +++ b/themes/gruvbox-dark.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/gruvbox.sh b/themes/gruvbox.sh index 5ce05bf..e4a22a4 100755 --- a/themes/gruvbox.sh +++ b/themes/gruvbox.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/hardcore.sh b/themes/hardcore.sh index 94830fa..0d32f79 100755 --- a/themes/hardcore.sh +++ b/themes/hardcore.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/harper.sh b/themes/harper.sh index 8635f33..7cddb38 100755 --- a/themes/harper.sh +++ b/themes/harper.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/hemisu-dark.sh b/themes/hemisu-dark.sh index 246a632..36c7fd5 100755 --- a/themes/hemisu-dark.sh +++ b/themes/hemisu-dark.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/hemisu-light.sh b/themes/hemisu-light.sh index 1063c9b..3a7db60 100755 --- a/themes/hemisu-light.sh +++ b/themes/hemisu-light.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/highway.sh b/themes/highway.sh index 551b89d..a550e6c 100755 --- a/themes/highway.sh +++ b/themes/highway.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/hipster-green.sh b/themes/hipster-green.sh index a86b16f..67cfec1 100755 --- a/themes/hipster-green.sh +++ b/themes/hipster-green.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/homebrew.sh b/themes/homebrew.sh index d32b770..caa73e9 100755 --- a/themes/homebrew.sh +++ b/themes/homebrew.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/hurtado.sh b/themes/hurtado.sh index c905c6e..43be000 100755 --- a/themes/hurtado.sh +++ b/themes/hurtado.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/hybrid.sh b/themes/hybrid.sh index 9c203cb..36b4050 100755 --- a/themes/hybrid.sh +++ b/themes/hybrid.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/ic-green-ppl.sh b/themes/ic-green-ppl.sh index c0e212b..ef80277 100755 --- a/themes/ic-green-ppl.sh +++ b/themes/ic-green-ppl.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ic-orange-ppl.sh b/themes/ic-orange-ppl.sh index 89db288..3194e98 100755 --- a/themes/ic-orange-ppl.sh +++ b/themes/ic-orange-ppl.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/idle-toes.sh b/themes/idle-toes.sh index eac8d9d..2710a47 100755 --- a/themes/idle-toes.sh +++ b/themes/idle-toes.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ir-black.sh b/themes/ir-black.sh index 2706a34..6940fba 100755 --- a/themes/ir-black.sh +++ b/themes/ir-black.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/jackie-brown.sh b/themes/jackie-brown.sh index a766f1f..14f8775 100755 --- a/themes/jackie-brown.sh +++ b/themes/jackie-brown.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/japanesque.sh b/themes/japanesque.sh index b6a5ded..567c2eb 100755 --- a/themes/japanesque.sh +++ b/themes/japanesque.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/jellybeans.sh b/themes/jellybeans.sh index 5cbe68b..da1c34a 100755 --- a/themes/jellybeans.sh +++ b/themes/jellybeans.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/jup.sh b/themes/jup.sh index 29976d6..c23bd2b 100755 --- a/themes/jup.sh +++ b/themes/jup.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/kibble.sh b/themes/kibble.sh index a395ebd..76bac53 100755 --- a/themes/kibble.sh +++ b/themes/kibble.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/later-this-evening.sh b/themes/later-this-evening.sh index 00f30f6..3d56718 100755 --- a/themes/later-this-evening.sh +++ b/themes/later-this-evening.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/lavandula.sh b/themes/lavandula.sh index 2fab288..3ac6e85 100755 --- a/themes/lavandula.sh +++ b/themes/lavandula.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/liquid-carbon-transparent.sh b/themes/liquid-carbon-transparent.sh index 13ef917..f1a284e 100755 --- a/themes/liquid-carbon-transparent.sh +++ b/themes/liquid-carbon-transparent.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/liquid-carbon.sh b/themes/liquid-carbon.sh index ba14901..c276d57 100755 --- a/themes/liquid-carbon.sh +++ b/themes/liquid-carbon.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/man-page.sh b/themes/man-page.sh index eb1465a..fa9fd84 100755 --- a/themes/man-page.sh +++ b/themes/man-page.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/mar.sh b/themes/mar.sh index cc0c86f..1ce28db 100755 --- a/themes/mar.sh +++ b/themes/mar.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/material.sh b/themes/material.sh index 1b5cf05..dc78dd1 100755 --- a/themes/material.sh +++ b/themes/material.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/mathias.sh b/themes/mathias.sh index be260b5..dd0c1b8 100755 --- a/themes/mathias.sh +++ b/themes/mathias.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/medallion.sh b/themes/medallion.sh index 250c587..aba6369 100755 --- a/themes/medallion.sh +++ b/themes/medallion.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/misterioso.sh b/themes/misterioso.sh index 0b87ac1..b36a968 100755 --- a/themes/misterioso.sh +++ b/themes/misterioso.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/miu.sh b/themes/miu.sh index cb11579..e24ec4e 100755 --- a/themes/miu.sh +++ b/themes/miu.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/molokai.sh b/themes/molokai.sh index 41882bc..9d6dbe6 100755 --- a/themes/molokai.sh +++ b/themes/molokai.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/mona-lisa.sh b/themes/mona-lisa.sh index 71e3c48..fa8ff43 100755 --- a/themes/mona-lisa.sh +++ b/themes/mona-lisa.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/monokai-dark.sh b/themes/monokai-dark.sh index 47f5a81..b72b651 100755 --- a/themes/monokai-dark.sh +++ b/themes/monokai-dark.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/monokai-soda.sh b/themes/monokai-soda.sh index c26efe3..f36dc11 100755 --- a/themes/monokai-soda.sh +++ b/themes/monokai-soda.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/n0tch2k.sh b/themes/n0tch2k.sh index 60c3218..47214df 100755 --- a/themes/n0tch2k.sh +++ b/themes/n0tch2k.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/neopolitan.sh b/themes/neopolitan.sh index 45a151c..de410fc 100755 --- a/themes/neopolitan.sh +++ b/themes/neopolitan.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/nep.sh b/themes/nep.sh index c78426a..48c0da8 100755 --- a/themes/nep.sh +++ b/themes/nep.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/neutron.sh b/themes/neutron.sh index 1906c41..b580d62 100755 --- a/themes/neutron.sh +++ b/themes/neutron.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/nightlion-v1.sh b/themes/nightlion-v1.sh index fb189f7..cfb27ad 100755 --- a/themes/nightlion-v1.sh +++ b/themes/nightlion-v1.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/nightlion-v2.sh b/themes/nightlion-v2.sh index f5ac3c2..79aae5f 100755 --- a/themes/nightlion-v2.sh +++ b/themes/nightlion-v2.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/nighty.sh b/themes/nighty.sh index 8286732..9457724 100644 --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ] then diff --git a/themes/nord-light.sh b/themes/nord-light.sh index ccc31f8..215e478 100755 --- a/themes/nord-light.sh +++ b/themes/nord-light.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/nord.sh b/themes/nord.sh index d1e3a45..d8be983 100755 --- a/themes/nord.sh +++ b/themes/nord.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/novel.sh b/themes/novel.sh index 55b685b..4188e89 100755 --- a/themes/novel.sh +++ b/themes/novel.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/obsidian.sh b/themes/obsidian.sh index 2206653..368f54b 100755 --- a/themes/obsidian.sh +++ b/themes/obsidian.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ocean-dark.sh b/themes/ocean-dark.sh index adb5fd7..6dce0cc 100755 --- a/themes/ocean-dark.sh +++ b/themes/ocean-dark.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/ocean.sh b/themes/ocean.sh index 1edfb89..38f8475 100755 --- a/themes/ocean.sh +++ b/themes/ocean.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/oceanic-next.sh b/themes/oceanic-next.sh index d838ec6..01065d5 100755 --- a/themes/oceanic-next.sh +++ b/themes/oceanic-next.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ollie.sh b/themes/ollie.sh index 35479a5..245cc43 100755 --- a/themes/ollie.sh +++ b/themes/ollie.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/one-dark.sh b/themes/one-dark.sh index 7ded4c0..7819ac5 100755 --- a/themes/one-dark.sh +++ b/themes/one-dark.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/one-half-black.sh b/themes/one-half-black.sh index 9a0036f..d0b4be5 100755 --- a/themes/one-half-black.sh +++ b/themes/one-half-black.sh @@ -55,11 +55,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/one-light.sh b/themes/one-light.sh index d26edca..a610627 100755 --- a/themes/one-light.sh +++ b/themes/one-light.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/pali.sh b/themes/pali.sh index c076726..43655ed 100755 --- a/themes/pali.sh +++ b/themes/pali.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/paraiso-dark.sh b/themes/paraiso-dark.sh index b12a98d..53a56aa 100755 --- a/themes/paraiso-dark.sh +++ b/themes/paraiso-dark.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/paul-millr.sh b/themes/paul-millr.sh index 258865f..24956ff 100755 --- a/themes/paul-millr.sh +++ b/themes/paul-millr.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/pencil-dark.sh b/themes/pencil-dark.sh index db579e7..2ab876f 100755 --- a/themes/pencil-dark.sh +++ b/themes/pencil-dark.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/pencil-light.sh b/themes/pencil-light.sh index 58e503b..d4411d4 100755 --- a/themes/pencil-light.sh +++ b/themes/pencil-light.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/peppermint.sh b/themes/peppermint.sh index 77e2b99..87b5a47 100755 --- a/themes/peppermint.sh +++ b/themes/peppermint.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/pnevma.sh b/themes/pnevma.sh index 800791a..8a12bbb 100755 --- a/themes/pnevma.sh +++ b/themes/pnevma.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/pro.sh b/themes/pro.sh index fc3a69a..59d2362 100755 --- a/themes/pro.sh +++ b/themes/pro.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/red-alert.sh b/themes/red-alert.sh index 002be66..0dd8e97 100755 --- a/themes/red-alert.sh +++ b/themes/red-alert.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/red-sands.sh b/themes/red-sands.sh index 2ef99ce..0008c12 100755 --- a/themes/red-sands.sh +++ b/themes/red-sands.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/rippedcasts.sh b/themes/rippedcasts.sh index 4632bf0..52c25c5 100755 --- a/themes/rippedcasts.sh +++ b/themes/rippedcasts.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/royal.sh b/themes/royal.sh index 1e3307d..824e88b 100755 --- a/themes/royal.sh +++ b/themes/royal.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/sat.sh b/themes/sat.sh index 5da4a35..3305de5 100755 --- a/themes/sat.sh +++ b/themes/sat.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/sea-shells.sh b/themes/sea-shells.sh index d426940..9b7bb10 100755 --- a/themes/sea-shells.sh +++ b/themes/sea-shells.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/seafoam-pastel.sh b/themes/seafoam-pastel.sh index fc7cce1..8a31caf 100755 --- a/themes/seafoam-pastel.sh +++ b/themes/seafoam-pastel.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/seti.sh b/themes/seti.sh index f3c4332..ce6b286 100755 --- a/themes/seti.sh +++ b/themes/seti.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/shaman.sh b/themes/shaman.sh index f62d98a..14d7bfe 100755 --- a/themes/shaman.sh +++ b/themes/shaman.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/shel.sh b/themes/shel.sh index bb715f0..6aa1062 100755 --- a/themes/shel.sh +++ b/themes/shel.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/slate.sh b/themes/slate.sh index 056123e..807b526 100755 --- a/themes/slate.sh +++ b/themes/slate.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/smyck.sh b/themes/smyck.sh index cca388a..17901f7 100755 --- a/themes/smyck.sh +++ b/themes/smyck.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/snazzy.sh b/themes/snazzy.sh index f0245d2..d2ed513 100644 --- a/themes/snazzy.sh +++ b/themes/snazzy.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/soft-server.sh b/themes/soft-server.sh index 394327e..58e21dc 100755 --- a/themes/soft-server.sh +++ b/themes/soft-server.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/solarized-darcula.sh b/themes/solarized-darcula.sh index 4b8a723..ead8e03 100755 --- a/themes/solarized-darcula.sh +++ b/themes/solarized-darcula.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/solarized-dark-higher-contrast.sh b/themes/solarized-dark-higher-contrast.sh index a8fc74a..b7fa431 100755 --- a/themes/solarized-dark-higher-contrast.sh +++ b/themes/solarized-dark-higher-contrast.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/solarized-dark.sh b/themes/solarized-dark.sh index 65fc9e8..8e5e091 100755 --- a/themes/solarized-dark.sh +++ b/themes/solarized-dark.sh @@ -54,11 +54,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/solarized-light.sh b/themes/solarized-light.sh index bd8d069..cf7e530 100755 --- a/themes/solarized-light.sh +++ b/themes/solarized-light.sh @@ -54,11 +54,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/spacedust.sh b/themes/spacedust.sh index f8f51ab..75ff498 100755 --- a/themes/spacedust.sh +++ b/themes/spacedust.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/spacegray-eighties-dull.sh b/themes/spacegray-eighties-dull.sh index 0f8cb66..e40cbe1 100755 --- a/themes/spacegray-eighties-dull.sh +++ b/themes/spacegray-eighties-dull.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/spacegray-eighties.sh b/themes/spacegray-eighties.sh index e968995..3e8d0ae 100755 --- a/themes/spacegray-eighties.sh +++ b/themes/spacegray-eighties.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/spacegray.sh b/themes/spacegray.sh index f31e2a4..b23885e 100755 --- a/themes/spacegray.sh +++ b/themes/spacegray.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/spring.sh b/themes/spring.sh index 66e1d2a..265230f 100755 --- a/themes/spring.sh +++ b/themes/spring.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/square.sh b/themes/square.sh index 49a8874..41e6e82 100755 --- a/themes/square.sh +++ b/themes/square.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/srcery.sh b/themes/srcery.sh index 2c1cb9d..3002354 100755 --- a/themes/srcery.sh +++ b/themes/srcery.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/sundried.sh b/themes/sundried.sh index d904349..4e3222c 100755 --- a/themes/sundried.sh +++ b/themes/sundried.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/symphonic.sh b/themes/symphonic.sh index 3f2afda..0b70fef 100755 --- a/themes/symphonic.sh +++ b/themes/symphonic.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/teerb.sh b/themes/teerb.sh index e22a026..2bf31ea 100755 --- a/themes/teerb.sh +++ b/themes/teerb.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/terminal-basic.sh b/themes/terminal-basic.sh index 0ffe2d3..a92e3b6 100755 --- a/themes/terminal-basic.sh +++ b/themes/terminal-basic.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/terminix-dark.sh b/themes/terminix-dark.sh index 4fd598d..958cc58 100755 --- a/themes/terminix-dark.sh +++ b/themes/terminix-dark.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/thayer-bright.sh b/themes/thayer-bright.sh index b3c603c..3ca1d5f 100755 --- a/themes/thayer-bright.sh +++ b/themes/thayer-bright.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/tin.sh b/themes/tin.sh index 0c67f66..ba3d584 100755 --- a/themes/tin.sh +++ b/themes/tin.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/tomorrow-night-blue.sh b/themes/tomorrow-night-blue.sh index 25cab9b..53fcbee 100755 --- a/themes/tomorrow-night-blue.sh +++ b/themes/tomorrow-night-blue.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/tomorrow-night-bright.sh b/themes/tomorrow-night-bright.sh index 3fc2d96..6822362 100755 --- a/themes/tomorrow-night-bright.sh +++ b/themes/tomorrow-night-bright.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/tomorrow-night-eighties.sh b/themes/tomorrow-night-eighties.sh index 3569a18..25d4e6c 100755 --- a/themes/tomorrow-night-eighties.sh +++ b/themes/tomorrow-night-eighties.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/tomorrow-night.sh b/themes/tomorrow-night.sh index 158466e..20831c6 100755 --- a/themes/tomorrow-night.sh +++ b/themes/tomorrow-night.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/tomorrow.sh b/themes/tomorrow.sh index 368395b..18d22c3 100755 --- a/themes/tomorrow.sh +++ b/themes/tomorrow.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/toy-chest.sh b/themes/toy-chest.sh index 126be37..305ccfb 100755 --- a/themes/toy-chest.sh +++ b/themes/toy-chest.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/treehouse.sh b/themes/treehouse.sh index 1054f8f..4fdebd9 100755 --- a/themes/treehouse.sh +++ b/themes/treehouse.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/twilight.sh b/themes/twilight.sh index dc6d76f..e0d2976 100755 --- a/themes/twilight.sh +++ b/themes/twilight.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/ura.sh b/themes/ura.sh index 57d721e..2c46b02 100755 --- a/themes/ura.sh +++ b/themes/ura.sh @@ -53,11 +53,9 @@ PARENT_PATH="$(dirname "$SCRIPT_PATH")" if [ -e $PARENT_PATH"/apply-colors.sh" ] then -gogh_colors source $PARENT_PATH"/apply-colors.sh" else -gogh_colors if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work diff --git a/themes/urple.sh b/themes/urple.sh index 1798fda..142d4e9 100755 --- a/themes/urple.sh +++ b/themes/urple.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/vag.sh b/themes/vag.sh index 9003353..1ff49af 100755 --- a/themes/vag.sh +++ b/themes/vag.sh @@ -51,14 +51,10 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -gogh_colors -source $PARENT_PATH"/apply-colors.sh" - +if [ -e $PARENT_PATH"/apply-colors.sh" ]; then + source $PARENT_PATH"/apply-colors.sh" else -gogh_colors - if [ $(uname) = "Darwin" ]; then + if [ $(uname) = "Darwin" ]; then # OSX ships with curl and ancient bash # Note: here, sourcing directly from curl does not work curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh diff --git a/themes/vaughn.sh b/themes/vaughn.sh index 837de3c..e538378 100755 --- a/themes/vaughn.sh +++ b/themes/vaughn.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/vibrant-ink.sh b/themes/vibrant-ink.sh index cd1c30f..e1b1df5 100755 --- a/themes/vibrant-ink.sh +++ b/themes/vibrant-ink.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/warm-neon.sh b/themes/warm-neon.sh index c778930..2922b62 100755 --- a/themes/warm-neon.sh +++ b/themes/warm-neon.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/wez.sh b/themes/wez.sh index fa37540..7958362 100755 --- a/themes/wez.sh +++ b/themes/wez.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/wild-cherry.sh b/themes/wild-cherry.sh index d1ce120..35499f9 100755 --- a/themes/wild-cherry.sh +++ b/themes/wild-cherry.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/wombat.sh b/themes/wombat.sh index 77dfa94..543e65e 100755 --- a/themes/wombat.sh +++ b/themes/wombat.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/wryan.sh b/themes/wryan.sh index b98c044..f08093c 100755 --- a/themes/wryan.sh +++ b/themes/wryan.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else diff --git a/themes/zenburn.sh b/themes/zenburn.sh index 44454ee..a9ca5e3 100755 --- a/themes/zenburn.sh +++ b/themes/zenburn.sh @@ -51,7 +51,6 @@ function curlsource() { SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -gogh_colors if [ -e $PARENT_PATH"/apply-colors.sh" ]; then source $PARENT_PATH"/apply-colors.sh" else From b54f0cb866907545fcb00132fd2732907c7946ec Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:39:32 +0100 Subject: [PATCH 03/25] Update gogh.sh --- gogh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gogh.sh b/gogh.sh index fd6afe9..f11c76a 100755 --- a/gogh.sh +++ b/gogh.sh @@ -317,7 +317,7 @@ fi # | # | If terminal supports truecolor then we can show theme colors without applying the theme # | =========================================== -if [[ "$COLORTERM" == "truecolor" ]] || [[ "$COLORTERM" == "24bit" ]]; then +if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; then # This function gets called in apply-colors.sh instead of gogh_colors # Calls to gogh_colors has also been move to apply-colors.sh to avoid printing twice function gogh_truecolor () { @@ -362,4 +362,4 @@ for OP in "${OPTION[@]#0}"; do echo -e "\\033[0m\033[0;31m ~ INVALID OPTION! ~\\033[0m\033[0m" exit 1 fi -done \ No newline at end of file +done From 0b4c843c190b8841a3266ddfc2ae94ac517212fe Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:43:14 +0100 Subject: [PATCH 04/25] Update gogh.sh --- gogh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gogh.sh b/gogh.sh index f11c76a..2840e59 100755 --- a/gogh.sh +++ b/gogh.sh @@ -336,7 +336,7 @@ fi # | # | ::::::: Export one-off variables # | -[[ -v TILIX_RES ]] && export TILIX_RES +[[ -n "${TILIX_RES:-} ]] && export TILIX_RES export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} # | From 96c609882328aa1be2893e8e0c286174a6ec6c38 Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:46:42 +0100 Subject: [PATCH 05/25] Update gogh.sh --- gogh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gogh.sh b/gogh.sh index 2840e59..379f844 100755 --- a/gogh.sh +++ b/gogh.sh @@ -336,7 +336,7 @@ fi # | # | ::::::: Export one-off variables # | -[[ -n "${TILIX_RES:-} ]] && export TILIX_RES +[[ -n "${TILIX_RES:-}" ]] && export TILIX_RES export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} # | From 37e58cb9330fe7af902a550235bd02478450fb11 Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:52:15 +0100 Subject: [PATCH 06/25] Update gogh.sh --- gogh.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/gogh.sh b/gogh.sh index 379f844..f69ff59 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,8 +1,5 @@ #!/usr/bin/env bash -# Handle errors gracefully -set -euo pipefail - declare -a THEMES=( '3024-day.sh' '3024-night.sh' From e3c9f1dc106d54ee2a21de320ae0dc3511014443 Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:54:37 +0100 Subject: [PATCH 07/25] Update gogh.sh --- gogh.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gogh.sh b/gogh.sh index f69ff59..8fcf10c 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -euo pipefail declare -a THEMES=( '3024-day.sh' From c5c84bfd43ad63a6ffa8284dc63eaa2efa134076 Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:57:00 +0100 Subject: [PATCH 08/25] Update gogh.sh --- gogh.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/gogh.sh b/gogh.sh index 8fcf10c..f69ff59 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -set -euo pipefail declare -a THEMES=( '3024-day.sh' From b4aae6e1c3f9fe4db14848108b2117d1a0edc1c4 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Wed, 7 Nov 2018 13:25:47 +0100 Subject: [PATCH 09/25] Major update with tilix support --- apply-colors.sh | 4 +--- gogh.sh | 11 +++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index 90ee098..e85f076 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -304,7 +304,7 @@ elif [ "$TERMINAL" = "tilix" ]; then if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then [[ -d "$HOME/.config/tilix/schemes" ]] || mkdir -p "${HOME}/.config/tilix/schemes" - TILIXCOLORS='{\n\t"background-color":"'${BACKGROUND_COLOR}'",\n\t"badge-color": "#FFFFFF",\n\t"bold-color": "#FFFFFF",\n\t"comment": "Generated by Gogh",\n\t"cursor-background-color": "#000000",\n\t"cursor-foreground-color": "'${CURSOR_COLOR}'",\n\t"foreground-color": "#FFFFFF",\n\t"highlight-background-color": "#000000",\n\t"highlight-foreground-color": "#FFFFFF",\n\t"name": "'${PROFILE_NAME}'",\n\t"palette": [\n\t\t"'${COLOR_01}'",\n\t\t"'${COLOR_02}'",\n\t\t"'${COLOR_03}'",\n\t\t"'${COLOR_04}'",\n\t\t"'${COLOR_05}'",\n\t\t"'${COLOR_06}'",\n\t\t"'${COLOR_07}'",\n\t\t"'${COLOR_08}'",\n\t\t"'${COLOR_09}'",\n\t\t"'${COLOR_10}'",\n\t\t"'${COLOR_11}'",\n\t\t"'${COLOR_12}'",\n\t\t"'${COLOR_13}'",\n\t\t"'${COLOR_14}'",\n\t\t"'${COLOR_15}'",\n\t\t"'${COLOR_16}'"\n\t],\n\t"use-badge-color": false,\n\t"use-bold-color": false,\n\t"use-cursor-color": false,\n\t"use-highlight-color": false,\n\t"use-theme-colors": false\n}' + TILIXCOLORS='{\n\t"background-color":"'${BACKGROUND_COLOR}'",\n\t"badge-color": "#FFFFFF",\n\t"bold-color": "#FFFFFF",\n\t"comment": "Generated by Gogh",\n\t"cursor-background-color": "#000000",\n\t"cursor-foreground-color": "'${CURSOR_COLOR}'",\n\t"foreground-color": "#FFFFFF",\n\t"highlight-background-color": "#000000",\n\t"highlight-foreground-color": "#FFFFFF",\n\t"name": "'${PROFILE_NAME}'",\n\t"palette": [\n\t\t"'${COLOR_01}'",\n\t\t"'${COLOR_02}'",\n\t\t"'${COLOR_03}'",\n\t\t"'${COLOR_04}'",\n\t\t"'${COLOR_05}'",\n\t\t"'${COLOR_06}'",\n\t\t"'${COLOR_07}'",\n\t\t"'${COLOR_08}'",\n\t\t"'${COLOR_09}'",\n\t\t"'${COLOR_10}'",\n\t\t"'${COLOR_11}'",\n\t\t"'${COLOR_12}'",\n\t\t"'${COLOR_13}'",\n\t\t"'${COLOR_14}'",\n\t\t"'${COLOR_15}'",\n\t\t"'${COLOR_16}'"\n\t],\n\t"use-badge-color": false,\n\t"use-bold-color": false,\n\t"use-cursor-color": true,\n\t"use-highlight-color": false,\n\t"use-theme-colors": false\n}' echo -e "$TILIXCOLORS" > "${scratchdir}/${PROFILE_NAME}.json" # Note: Tilix does not store color scheme name in dconf @@ -313,8 +313,6 @@ elif [ "$TERMINAL" = "tilix" ]; then if ((LOOP == OPTLENGTH)); then cp -f "$scratchdir"/* "$HOME/.config/tilix/schemes/" rm -rf "${scratchdir}" - PROFILE_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" - PROFILE_NAME=$($DCONF read $PROFILE_KEY/visible-name | tr -d "'") read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then PROFILE_KEY="$BASE_KEY_NEW/$DEFAULT_SLUG" diff --git a/gogh.sh b/gogh.sh index fd6afe9..cc0646c 100755 --- a/gogh.sh +++ b/gogh.sh @@ -176,9 +176,9 @@ declare -a THEMES=( cleanup() { echo - echo "Caught signal..$? Cleaning up" + echo "Cleaning up" rm -rf "$scratchdir" - unset TERMINAL TRUECOLOR LOOP OPTLENGTH + unset TERMINAL LOOP OPTLENGTH echo "Done..." exit 0 } @@ -318,17 +318,16 @@ fi # | If terminal supports truecolor then we can show theme colors without applying the theme # | =========================================== if [[ "$COLORTERM" == "truecolor" ]] || [[ "$COLORTERM" == "24bit" ]]; then - # This function gets called in apply-colors.sh instead of gogh_colors + # This function gets called in apply-colors.sh # Calls to gogh_colors has also been move to apply-colors.sh to avoid printing twice function gogh_truecolor () { - echo for c in {01..16}; do local color="COLOR_$c" set -- $(hexRGBtoDecRGB "${!color}") - echo -ne "\033[38;2;${1};${2};${3}m█████" + echo -ne "\033[38;2;${1};${2};${3}m█████\033[0m" [[ "$c" == "08" ]] && echo # new line done - echo + echo -e "\n\n" } export -f gogh_truecolor fi From f4f280d78ca1992c4bce33fa38eb3548ac6f85fb Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Wed, 7 Nov 2018 17:20:54 +0100 Subject: [PATCH 10/25] Update gogh.sh --- gogh.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gogh.sh b/gogh.sh index 13037f4..5ce6125 100755 --- a/gogh.sh +++ b/gogh.sh @@ -318,7 +318,8 @@ if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; t # This function gets called in apply-colors.sh instead of gogh_colors # Calls to gogh_colors has also been move to apply-colors.sh to avoid printing twice function gogh_truecolor () { - for c in {01..16}; do + # Note: {01..16} does not work on OSX + for c in $(seq -s " " -w 16); do local color="COLOR_$c" set -- $(hexRGBtoDecRGB "${!color}") echo -ne "\033[38;2;${1};${2};${3}m█████\033[0m" From edd964b496ba34f647037d9047ed1587913d6738 Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Fri, 9 Nov 2018 14:25:59 +0100 Subject: [PATCH 11/25] Update gogh.sh --- gogh.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gogh.sh b/gogh.sh index 5ce6125..cd65cd7 100755 --- a/gogh.sh +++ b/gogh.sh @@ -201,14 +201,6 @@ capitalize() { echo "${RES_NO_TRAIL_SPACE}" } -curlsource() { - local F - F=$(mktemp -t curlsource) - curl -o "$F" -s -L "$1" - source "$F" - rm -f "$F" -} - set_gogh() { string=$1 string_r="${string%???}" @@ -225,10 +217,9 @@ set_gogh() { else if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl - # Note: sourcing directly from curl does not work - curlsource "${url}" + bash -c eval "$(curl -Lo- "${url}")" else - bash <(wget -O - "${url}") + bash <(wget -O- "${url}") fi fi } From b2f7a809cb86c2090b9121670b624024542b102e Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Fri, 9 Nov 2018 14:51:07 +0100 Subject: [PATCH 12/25] Update gogh.sh --- gogh.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gogh.sh b/gogh.sh index cd65cd7..ac47c84 100755 --- a/gogh.sh +++ b/gogh.sh @@ -217,9 +217,10 @@ set_gogh() { else if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl - bash -c eval "$(curl -Lo- "${url}")" + (eval "$(curl -sLo- "${url}")") else - bash <(wget -O- "${url}") + # Linux ships with wget + (eval "$(wget -qO- "${url}")") fi fi } From c60eb20614aade74edd7773b87688c1825750100 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 13 Nov 2018 18:51:25 +0100 Subject: [PATCH 13/25] Major update with tilix support --- apply-colors.sh | 40 ++- gogh.sh | 146 ++++++----- test/print-themes.sh | 295 +++++++++++++++++++++++ themes/3024-day.sh | 34 +-- themes/3024-night.sh | 34 +-- themes/_base.sh | 30 +-- themes/aci.sh | 34 +-- themes/aco.sh | 34 +-- themes/adventuretime.sh | 34 +-- themes/afterglow.sh | 34 +-- themes/alien-blood.sh | 34 +-- themes/argonaut.sh | 34 +-- themes/arthur.sh | 34 +-- themes/atom.sh | 34 +-- themes/azu.sh | 34 +-- themes/belafonte-day.sh | 34 +-- themes/belafonte-night.sh | 34 +-- themes/bim.sh | 34 +-- themes/birds-of-paradise.sh | 34 +-- themes/blazer.sh | 34 +-- themes/borland.sh | 34 +-- themes/broadcast.sh | 34 +-- themes/brogrammer.sh | 34 +-- themes/c64.sh | 34 +-- themes/cai.sh | 34 +-- themes/chalk.sh | 34 +-- themes/chalkboard.sh | 34 +-- themes/ciapre.sh | 34 +-- themes/clone-of-ubuntu.sh | 30 +-- themes/clrs.sh | 34 +-- themes/cobalt-neon.sh | 34 +-- themes/cobalt2.sh | 34 +-- themes/crayon-pony-fish.sh | 34 +-- themes/dark-pastel.sh | 34 +-- themes/darkside.sh | 34 +-- themes/desert.sh | 34 +-- themes/dimmed-monokai.sh | 34 +-- themes/dracula.sh | 34 +-- themes/earthsong.sh | 34 +-- themes/elemental.sh | 34 +-- themes/elementary.sh | 34 +-- themes/elic.sh | 34 +-- themes/elio.sh | 34 +-- themes/espresso-libre.sh | 34 +-- themes/espresso.sh | 34 +-- themes/fishtank.sh | 34 +-- themes/flat.sh | 34 +-- themes/flatland.sh | 34 +-- themes/foxnightly.sh | 34 +-- themes/freya.sh | 34 +-- themes/frontend-delight.sh | 34 +-- themes/frontend-fun-forrest.sh | 34 +-- themes/frontend-galaxy.sh | 34 +-- themes/github.sh | 34 +-- themes/gooey.sh | 30 +-- themes/google-dark.sh | 30 +-- themes/google-light.sh | 30 +-- themes/grape.sh | 34 +-- themes/grass.sh | 34 +-- themes/gruvbox-dark.sh | 34 +-- themes/gruvbox.sh | 34 +-- themes/hardcore.sh | 34 +-- themes/harper.sh | 34 +-- themes/hemisu-dark.sh | 34 +-- themes/hemisu-light.sh | 34 +-- themes/highway.sh | 34 +-- themes/hipster-green.sh | 34 +-- themes/homebrew.sh | 34 +-- themes/hurtado.sh | 34 +-- themes/hybrid.sh | 34 +-- themes/ic-green-ppl.sh | 34 +-- themes/ic-orange-ppl.sh | 34 +-- themes/idle-toes.sh | 34 +-- themes/ir-black.sh | 34 +-- themes/jackie-brown.sh | 34 +-- themes/japanesque.sh | 34 +-- themes/jellybeans.sh | 34 +-- themes/jup.sh | 34 +-- themes/kibble.sh | 34 +-- themes/later-this-evening.sh | 34 +-- themes/lavandula.sh | 34 +-- themes/liquid-carbon-transparent.sh | 34 +-- themes/liquid-carbon.sh | 34 +-- themes/man-page.sh | 34 +-- themes/mar.sh | 34 +-- themes/material.sh | 34 +-- themes/mathias.sh | 34 +-- themes/medallion.sh | 34 +-- themes/misterioso.sh | 34 +-- themes/miu.sh | 34 +-- themes/molokai.sh | 34 +-- themes/mona-lisa.sh | 34 +-- themes/monokai-dark.sh | 34 +-- themes/monokai-soda.sh | 34 +-- themes/n0tch2k.sh | 34 +-- themes/neopolitan.sh | 34 +-- themes/nep.sh | 34 +-- themes/neutron.sh | 34 +-- themes/nightlion-v1.sh | 34 +-- themes/nightlion-v2.sh | 34 +-- themes/nighty.sh | 30 +-- themes/nord-light.sh | 34 +-- themes/nord.sh | 34 +-- themes/novel.sh | 34 +-- themes/obsidian.sh | 34 +-- themes/ocean-dark.sh | 34 +-- themes/ocean.sh | 34 +-- themes/oceanic-next.sh | 34 +-- themes/ollie.sh | 34 +-- themes/one-dark.sh | 34 +-- themes/one-half-black.sh | 34 +-- themes/one-light.sh | 34 +-- themes/pali.sh | 34 +-- themes/paraiso-dark.sh | 34 +-- themes/paul-millr.sh | 34 +-- themes/pencil-dark.sh | 34 +-- themes/pencil-light.sh | 34 +-- themes/peppermint.sh | 34 +-- themes/pnevma.sh | 34 +-- themes/pro.sh | 34 +-- themes/red-alert.sh | 34 +-- themes/red-sands.sh | 34 +-- themes/rippedcasts.sh | 34 +-- themes/royal.sh | 34 +-- themes/sat.sh | 34 +-- themes/sea-shells.sh | 34 +-- themes/seafoam-pastel.sh | 34 +-- themes/seti.sh | 34 +-- themes/shaman.sh | 34 +-- themes/shel.sh | 34 +-- themes/slate.sh | 34 +-- themes/smyck.sh | 34 +-- themes/snazzy.sh | 34 +-- themes/soft-server.sh | 34 +-- themes/solarized-darcula.sh | 34 +-- themes/solarized-dark-higher-contrast.sh | 34 +-- themes/solarized-dark.sh | 35 +-- themes/solarized-light.sh | 35 +-- themes/spacedust.sh | 34 +-- themes/spacegray-eighties-dull.sh | 34 +-- themes/spacegray-eighties.sh | 34 +-- themes/spacegray.sh | 34 +-- themes/spring.sh | 34 +-- themes/square.sh | 34 +-- themes/srcery.sh | 34 +-- themes/sundried.sh | 34 +-- themes/symphonic.sh | 34 +-- themes/teerb.sh | 34 +-- themes/terminal-basic.sh | 34 +-- themes/terminix-dark.sh | 34 +-- themes/thayer-bright.sh | 34 +-- themes/tin.sh | 34 +-- themes/tomorrow-night-blue.sh | 34 +-- themes/tomorrow-night-bright.sh | 34 +-- themes/tomorrow-night-eighties.sh | 34 +-- themes/tomorrow-night.sh | 34 +-- themes/tomorrow.sh | 34 +-- themes/toy-chest.sh | 34 +-- themes/treehouse.sh | 34 +-- themes/twilight.sh | 34 +-- themes/ura.sh | 34 +-- themes/urple.sh | 34 +-- themes/vag.sh | 34 +-- themes/vaughn.sh | 34 +-- themes/vibrant-ink.sh | 34 +-- themes/warm-neon.sh | 34 +-- themes/wez.sh | 34 +-- themes/wild-cherry.sh | 34 +-- themes/wombat.sh | 34 +-- themes/wryan.sh | 34 +-- themes/zenburn.sh | 34 +-- 171 files changed, 2372 insertions(+), 3799 deletions(-) create mode 100644 test/print-themes.sh mode change 100644 => 100755 themes/google-dark.sh mode change 100644 => 100755 themes/google-light.sh mode change 100644 => 100755 themes/nighty.sh mode change 100644 => 100755 themes/snazzy.sh diff --git a/apply-colors.sh b/apply-colors.sh index e85f076..2190acc 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -106,14 +106,44 @@ set_theme() { dset use-theme-background "false" } +# | +# | If terminal supports truecolor then we can show theme colors without applying the theme +# | =========================================== +if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; then + # gogh_colors have been moved here to avoid multiple definitions + function gogh_colors () { + echo + # Note: {01..16} does not work on OSX + for c in $(seq -s " " -w 16); do + local color="COLOR_$c" + set -- $(hexRGBtoDecRGB "${!color}") + echo -ne "\033[38;2;${1};${2};${3}m█████$(tput sgr0)" + [[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && declare -g DEMO_COLOR_${c}="\033[38;2;${1};${2};${3}m" + [[ "$c" == "08" ]] && echo # new line + done + echo -e "\n\n" + } +else + function gogh_colors () { + echo + for c in {0..15}; do + echo -n "$(tput setaf $c)█████$(tput sgr0)" + [[ $c == 7 ]] && echo # new line + done + echo -e "\n\n" + } +fi + + # | # | Print theme colors # | =========================================== -if command -v gogh_truecolor > /dev/null; then - gogh_truecolor -else - gogh_colors -fi +gogh_colors +[[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && color + +# End here if dry run was initiated +[[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && return 0 + # | # | Apply color scheme to terminal diff --git a/gogh.sh b/gogh.sh index 5ce6125..dc991e8 100755 --- a/gogh.sh +++ b/gogh.sh @@ -170,20 +170,8 @@ declare -a THEMES=( 'zenburn.sh' ) - -cleanup() { - echo - echo "Cleaning up" - rm -rf "$scratchdir" - unset TERMINAL LOOP OPTLENGTH - echo "Done..." - exit 0 -} - -scratchdir=$(mktemp -d -t tmp.XXXXXXXX) -export scratchdir -trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM - +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} capitalize() { local ARGUMENT=$1 @@ -201,53 +189,72 @@ capitalize() { echo "${RES_NO_TRAIL_SPACE}" } -curlsource() { - local F - F=$(mktemp -t curlsource) - curl -o "$F" -s -L "$1" - source "$F" - rm -f "$F" -} set_gogh() { string=$1 string_r="${string%???}" string_s=${string_r//\./_} result=$(capitalize "${string_s}") - url="https://raw.githubusercontent.com/Mayccoll/Gogh/master/themes/$1" + url="${BASE_URL}/themes/$1" export {PROFILE_NAME,PROFILE_SLUG}="$result" # Evaluate if Gogh was called from local source - i.e cloned repo SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ -e "$SCRIPT_PATH/themes/$1" ]; then - bash "$SCRIPT_PATH/themes/$1" + eval "$SCRIPT_PATH/themes/$1" else if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl - # Note: sourcing directly from curl does not work - curlsource "${url}" + eval "$(curl -so- "${url}")" else - bash <(wget -O - "${url}") + eval "$(wget -qO- "${url}")" fi fi } + remove_file_extension (){ echo "${1%.*}" } + ### Get length of an array ARRAYLENGTH=${#THEMES[@]} NUM=1 + # | -# | ::::::: Print Colors +# | ::::::: Print logo # | -echo -e " -Gogh\n -\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m -\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" +tput clear +if [[ ${COLUMNS:-$(tput cols)} -ge 80 ]]; then + echo " " + echo " █████████ █████ " + echo " ███ ███ ███ " + echo " ███ ██████ ███████ ███████ " + echo " ███ ███ ███ ███ ███ ███ ███ " + echo " ███ █████ ███ ███ ███ ███ ███ ███ " + echo " ███ ███ ███ ███ ███ ███ ███ ███ " + echo " █████████ ██████ ███████ ████ █████ " + echo " $(tput setaf 0)█████████$(tput setaf 1)█████████$(tput setaf 2)█████████$(tput setaf 3)█████████$(tput setaf 4)█████$(tput sgr 0)███$(tput setaf 4)█$(tput setaf 5)█████████$(tput setaf 6)█████████$(tput setaf 7)█████████ " + echo " $(tput setaf 0)█████████$(tput setaf 1)█████████$(tput setaf 2)█████████$(tput setaf 3)█████████$(tput sgr 0)███$(tput setaf 4)██$(tput sgr 0)███$(tput setaf 4)█$(tput setaf 5)█████████$(tput setaf 6)█████████$(tput setaf 7)█████████ " + echo " $(tput setaf 0)█████████$(tput setaf 1)█████████$(tput setaf 2)█████████$(tput setaf 3)█████████$(tput setaf 4)█$(tput sgr0)██████$(tput setaf 4)██$(tput setaf 5)█████████$(tput setaf 6)█████████$(tput setaf 7)█████████ " + echo " $(tput setaf 8)█████████$(tput setaf 9)█████████$(tput setaf 10)█████████$(tput setaf 11)█████████$(tput setaf 12)█████████$(tput setaf 13)█████████$(tput setaf 14)█████████$(tput setaf 15)█████████$(tput sgr 0) " + echo " $(tput setaf 8)█████████$(tput setaf 9)█████████$(tput setaf 10)█████████$(tput setaf 11)█████████$(tput setaf 12)█████████$(tput setaf 13)█████████$(tput setaf 14)█████████$(tput setaf 15)█████████$(tput sgr 0) " + echo " $(tput setaf 8)█████████$(tput setaf 9)█████████$(tput setaf 10)█████████$(tput setaf 11)█████████$(tput setaf 12)█████████$(tput setaf 13)█████████$(tput setaf 14)█████████$(tput setaf 15)█████████$(tput sgr 0) " + echo " " + + sleep 2.5 +else + echo -e "\nGogh\n" + for c in {0..15}; do + echo -n "$(tput setaf $c)█████$(tput sgr0)" + [[ $c == 7 ]] && echo # new line + done + echo +fi + # | # | ::::::: Print Themes @@ -260,19 +267,22 @@ for TH in "${THEMES[@]}"; do FILENAME=${TH::$((${#TH}-3))} FILENAME_SPACE=${FILENAME//-/ } - echo -e " (\\033[0m\033[0;34m $KEY \\033[0m\033[0m) $(capitalize "${FILENAME_SPACE}")" + echo -e " ($(tput setaf 4) $KEY $(tput sgr0)) $(capitalize "${FILENAME_SPACE}")" ((NUM++)) done + echo -e " ($(tput setaf 4) ALL $(tput sgr0)) All themes" # | # | ::::::: Select Option # | -echo -e "\nUsage : Enter Desired Themes Numbers (\\033[0m\033[0;34mOPTIONS\\033[0m\033[0m) Separated By A Blank Space" -echo -e " Press \033[0;34mENTER\\033[0m without options to Exit\n" +echo -e "\nUsage : Enter Desired Themes Numbers ($(tput setaf 4)OPTIONS$(tput sgr0)) Separated By A Blank Space" +echo -e " Press $(tput setaf 4)ENTER$(tput sgr0) without options to Exit\n" read -r -p 'Enter OPTION(S) : ' -a OPTION +# Automagically generate options if user opts for all themes +[[ "$OPTION" == ALL ]] && OPTION=($(seq -s " " $ARRAYLENGTH)) # | # | ::::::: Get terminal @@ -280,7 +290,7 @@ read -r -p 'Enter OPTION(S) : ' -a OPTION # | # | Check for the terminal name (depening on os) # | =========================================== -OS=$(uname) +OS="$(uname)" if [ "$OS" = "Darwin" ]; then # | # | Check for the terminal name and decide how to apply @@ -301,34 +311,49 @@ else done fi + +# | +# | ::::::: Fancy progressbar for lengthy operations +# | +if [[ ${#OPTION[@]} -gt 5 ]]; then + if [ "$(uname)" = "Darwin" ]; then + eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null + else + eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null + fi +fi + + # | # | Tilix supports fg/bg in color schemes - ask wether user wants to go that route # | This is to avoid creating multiple profiles just for colors # | =========================================== -if [[ "$TERMINAL" = "tilix" ]]; then +if [[ "$TERMINAL" = "tilix" ]] && [[ ${#OPTION[@]} -gt 0 ]]; then echo read -r -p "Tilix detected - use color schemes instead of profiles? [y/N] " -n 1 TILIX_RES echo + + # | + # | When selecting multiple themes and user opts for color schemes, we save all themes + # | in a tmpdir and copy the files once all themes has been processed.. If a user + # | desides to abort before all themes has been processed this section will cleanup the tmpdir + # | ======================================= + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + cleanup() { + echo + echo "Cleaning up" + rm -rf "$scratchdir" + unset LOOP OPTLENGTH + echo "Done..." + exit 0 + } + + scratchdir=$(mktemp -d -t tmp.XXXXXXXX) + export scratchdir + trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM + fi fi -# | -# | If terminal supports truecolor then we can show theme colors without applying the theme -# | =========================================== -if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; then - # This function gets called in apply-colors.sh instead of gogh_colors - # Calls to gogh_colors has also been move to apply-colors.sh to avoid printing twice - function gogh_truecolor () { - # Note: {01..16} does not work on OSX - for c in $(seq -s " " -w 16); do - local color="COLOR_$c" - set -- $(hexRGBtoDecRGB "${!color}") - echo -ne "\033[38;2;${1};${2};${3}m█████\033[0m" - [[ "$c" == "08" ]] && echo # new line - done - echo -e "\n\n" - } - export -f gogh_truecolor -fi # | # | ::::::: Export one-off variables @@ -336,6 +361,7 @@ fi [[ -n "${TILIX_RES:-}" ]] && export TILIX_RES export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} + # | # | ::::::: Apply Theme # | @@ -344,19 +370,27 @@ export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} # Constants with a leading 0 are interpreted as octal numbers # Hence option 08 and 09 will not work # Solution is to remove the leading 0 from the parsed options +bar::start 2> /dev/null for OP in "${OPTION[@]#0}"; do # See Tilix section in apply-colors.sh for usage of LOOP LOOP=$((${LOOP:-0}+1)) + bar::status_changed $LOOP ${#OPTION[@]} 2> /dev/null if [[ OP -le ARRAYLENGTH && OP -gt 0 ]]; then FILENAME=$(remove_file_extension "${THEMES[((OP-1))]}") FILENAME_SPACE="${FILENAME//-/ }" - echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")\n\033[0;30m•\\033[0m\033[0;31m•\\033[0m\033[0;32m•\\033[0m\033[0;33m•\\033[0m\033[0;34m•\\033[0m\033[0;35m•\\033[0m\033[0;36m•\\033[0m\033[0;37m•\\033[0m \033[0;37m•\\033[0m\033[0;36m•\\033[0m\033[0;35m•\\033[0m\033[0;34m•\\033[0m\033[0;33m•\\033[0m\033[0;32m•\\033[0m\033[0;31m•\\033[0m\033[0;30m•\\033[0m\n" + echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")" + for c in {0..15}; do + echo -n "$(tput setaf $c)•$(tput sgr0)" + [[ $c == 7 ]] && echo -n " " + done + echo SET_THEME="${THEMES[((OP-1))]}" set_gogh "${SET_THEME}" else - echo -e "\\033[0m\033[0;31m ~ INVALID OPTION! ~\\033[0m\033[0m" + echo -e "$(tput setaf 1) ~ INVALID OPTION! ~$(tput sgr0)" exit 1 fi done +bar::stop 2> /dev/null \ No newline at end of file diff --git a/test/print-themes.sh b/test/print-themes.sh new file mode 100644 index 0000000..d75b2ec --- /dev/null +++ b/test/print-themes.sh @@ -0,0 +1,295 @@ +#!/usr/bin/env bash + +if [[ "${COLORTERM:-}" != "truecolor" ]] && [[ "${COLORTERM:-}" != "24bit" ]]; then + echo "TrueColor support is needed for this to function" + echo "You can try to manually set COLORTERM to truecolor" + exit 1 +fi + +# Reset color +RS="$(tput sgr0)" + +# Print all themes without applying, this variable gets checked in apply-colors.sh +export GOGH_DRY_RUN=1 + +color () { + # echo "" + #black + echo -e "${DEMO_COLOR_01} ███ *** AaBbCs --- ███ ${RS} ---> Color 01 'tput setaf 0'" + #red + echo -e "${DEMO_COLOR_02} ███ *** AaBbCs --- ███ ${RS} ---> Color 02 'tput setaf 1'" + #green + echo -e "${DEMO_COLOR_03} ███ *** AaBbCs --- ███ ${RS} ---> Color 03 'tput setaf 2'" + #yellow + echo -e "${DEMO_COLOR_04} ███ *** AaBbCs --- ███ ${RS} ---> Color 04 'tput setaf 3'" + #blue + echo -e "${DEMO_COLOR_05} ███ *** AaBbCs --- ███ ${RS} ---> Color 05 'tput setaf 4'" + #purple + echo -e "${DEMO_COLOR_06} ███ *** AaBbCs --- ███ ${RS} ---> Color 06 'tput setaf 5'" + #cyan + echo -e "${DEMO_COLOR_07} ███ *** AaBbCs --- ███ ${RS} ---> Color 07 'tput setaf 6'" + #white + echo -e "${DEMO_COLOR_08} ███ *** AaBbCs --- ███ ${RS} ---> Color 08 'tput setaf 7'" + echo "" + #black + echo -e "${DEMO_COLOR_09} ███ *** AaBbCs --- ███ ${RS} ---> Color 09 'tput setaf 8'" + #red + echo -e "${DEMO_COLOR_10} ███ *** AaBbCs --- ███ ${RS} ---> Color 10 'tput setaf 9'" + #green + echo -e "${DEMO_COLOR_11} ███ *** AaBbCs --- ███ ${RS} ---> Color 11 'tput setaf 10'" + #yellow + echo -e "${DEMO_COLOR_12} ███ *** AaBbCs --- ███ ${RS} ---> Color 12 'tput setaf 11'" + #blue + echo -e "${DEMO_COLOR_13} ███ *** AaBbCs --- ███ ${RS} ---> Color 13 'tput setaf 12'" + #purple + echo -e "${DEMO_COLOR_14} ███ *** AaBbCs --- ███ ${RS} ---> Color 14 'tput setaf 13'" + #cyan + echo -e "${DEMO_COLOR_15} ███ *** AaBbCs --- ███ ${RS} ---> Color 15 'tput setaf 14'" + #white + echo -e "${DEMO_COLOR_16} ███ *** AaBbCs --- ███ ${RS} ---> Color 16 'tput setaf 15'" + echo "" +} + +export -f color + +declare -a THEMES=( + '3024-day.sh' + '3024-night.sh' + 'aci.sh' + 'aco.sh' + 'adventuretime.sh' + 'afterglow.sh' + 'alien-blood.sh' + 'argonaut.sh' + 'arthur.sh' + 'atom.sh' + 'azu.sh' + 'belafonte-day.sh' + 'belafonte-night.sh' + 'bim.sh' + 'birds-of-paradise.sh' + 'blazer.sh' + 'borland.sh' + 'broadcast.sh' + 'brogrammer.sh' + 'c64.sh' + 'cai.sh' + 'chalk.sh' + 'chalkboard.sh' + 'ciapre.sh' + 'clone-of-ubuntu.sh' + 'clrs.sh' + 'cobalt-neon.sh' + 'cobalt2.sh' + 'crayon-pony-fish.sh' + 'dark-pastel.sh' + 'darkside.sh' + 'desert.sh' + 'dimmed-monokai.sh' + 'dracula.sh' + 'earthsong.sh' + 'elemental.sh' + 'elementary.sh' + 'elic.sh' + 'elio.sh' + 'espresso-libre.sh' + 'espresso.sh' + 'fishtank.sh' + 'flat.sh' + 'flatland.sh' + 'foxnightly.sh' + 'freya.sh' + 'frontend-delight.sh' + 'frontend-fun-forrest.sh' + 'frontend-galaxy.sh' + 'github.sh' + 'google-dark.sh' + 'google-light.sh' + 'gooey.sh' + 'grape.sh' + 'grass.sh' + 'gruvbox-dark.sh' + 'gruvbox.sh' + 'hardcore.sh' + 'harper.sh' + 'hemisu-dark.sh' + 'hemisu-light.sh' + 'highway.sh' + 'hipster-green.sh' + 'homebrew.sh' + 'hurtado.sh' + 'hybrid.sh' + 'ic-green-ppl.sh' + 'ic-orange-ppl.sh' + 'idle-toes.sh' + 'ir-black.sh' + 'jackie-brown.sh' + 'japanesque.sh' + 'jellybeans.sh' + 'jup.sh' + 'kibble.sh' + 'later-this-evening.sh' + 'lavandula.sh' + 'liquid-carbon-transparent.sh' + 'liquid-carbon.sh' + 'man-page.sh' + 'mar.sh' + 'material.sh' + 'mathias.sh' + 'medallion.sh' + 'misterioso.sh' + 'miu.sh' + 'molokai.sh' + 'mona-lisa.sh' + 'monokai-dark.sh' + 'monokai-soda.sh' + 'n0tch2k.sh' + 'neopolitan.sh' + 'nep.sh' + 'neutron.sh' + 'nightlion-v1.sh' + 'nightlion-v2.sh' + 'nighty.sh' + 'nord-light.sh' + 'nord.sh' + 'novel.sh' + 'obsidian.sh' + 'ocean-dark.sh' + 'ocean.sh' + 'oceanic-next.sh' + 'ollie.sh' + 'one-dark.sh' + 'one-half-black.sh' + 'one-light.sh' + 'pali.sh' + 'paraiso-dark.sh' + 'paul-millr.sh' + 'pencil-dark.sh' + 'pencil-light.sh' + 'peppermint.sh' + 'pnevma.sh' + 'pro.sh' + 'red-alert.sh' + 'red-sands.sh' + 'rippedcasts.sh' + 'royal.sh' + 'sat.sh' + 'sea-shells.sh' + 'seafoam-pastel.sh' + 'seti.sh' + 'shaman.sh' + 'shel.sh' + 'slate.sh' + 'smyck.sh' + 'snazzy.sh' + 'soft-server.sh' + 'solarized-darcula.sh' + 'solarized-dark-higher-contrast.sh' + 'solarized-dark.sh' + 'solarized-light.sh' + 'spacedust.sh' + 'spacegray-eighties-dull.sh' + 'spacegray-eighties.sh' + 'spacegray.sh' + 'spring.sh' + 'square.sh' + 'srcery.sh' + 'sundried.sh' + 'symphonic.sh' + 'teerb.sh' + 'terminal-basic.sh' + 'terminix-dark.sh' + 'thayer-bright.sh' + 'tin.sh' + 'tomorrow-night-blue.sh' + 'tomorrow-night-bright.sh' + 'tomorrow-night-eighties.sh' + 'tomorrow-night.sh' + 'tomorrow.sh' + 'toy-chest.sh' + 'treehouse.sh' + 'twilight.sh' + 'ura.sh' + 'urple.sh' + 'vag.sh' + 'vaughn.sh' + 'vibrant-ink.sh' + 'warm-neon.sh' + 'wez.sh' + 'wild-cherry.sh' + 'wombat.sh' + 'wryan.sh' + 'zenburn.sh' +) + +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +capitalize() { + local ARGUMENT=$1 + local RES="" + local STR="" + local RES_NO_TRAIL_SPACE="" + + for CHAR in $ARGUMENT + do + STR=$(echo "${CHAR:0:1}" | tr "[:lower:]" "[:upper:]")"${CHAR:1} " + RES="${RES}${STR}" + RES_NO_TRAIL_SPACE="$(echo -e "${RES}" | sed -e 's/[[:space:]]*$//')" + done + + echo "${RES_NO_TRAIL_SPACE}" +} + +set_gogh() { + url="https://raw.githubusercontent.com/Mayccoll/Gogh/master/themes/$1" + + # Evaluate if Gogh was called from local source - i.e cloned repo + SCRIPT_PATH="$( cd "../$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [ -e "$SCRIPT_PATH/themes/$1" ]; then + eval "$SCRIPT_PATH/themes/$1" + else + if [ "$(uname)" = "Darwin" ]; then + # OSX ships with curl + eval "$(curl -so- "${url}")" + else + eval "$(wget -qO- "${url}")" + fi + fi +} + +remove_file_extension (){ + echo "${1%.*}" +} + +# Fancy progress bar +if [ "$(uname)" = "Darwin" ]; then + # OSX ships with curl + eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null +else + eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null +fi + +bar::start 2> /dev/null + +for THEME in "${THEMES[@]}"; do + LOOP=$((${LOOP:-(-1)}+1)) + bar::status_changed $LOOP ${#THEMES[@]} 2> /dev/null + + FILENAME=$(remove_file_extension "${THEME}") + FILENAME_SPACE="${FILENAME//-/ }" + echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")" + for c in {0..15}; do + echo -n "$(tput setaf $c)•$(tput sgr0)" + [[ $c == 7 ]] && echo -n " " + done + echo + set_gogh "${THEME}" +done + +LOOP=$((${LOOP:-(-1)}+1)) +bar::status_changed $LOOP ${#THEMES[@]} 2> /dev/null + +bar::stop 2> /dev/null + +unset GOGH_DRY_RUN \ No newline at end of file diff --git a/themes/3024-day.sh b/themes/3024-day.sh index 0e6ed27..c150c4d 100755 --- a/themes/3024-day.sh +++ b/themes/3024-day.sh @@ -34,32 +34,22 @@ PROFILE_NAME="3024 Day" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/3024-night.sh b/themes/3024-night.sh index 7d3f89d..3b6a2b8 100755 --- a/themes/3024-night.sh +++ b/themes/3024-night.sh @@ -34,32 +34,22 @@ PROFILE_NAME="3024 Night" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/_base.sh b/themes/_base.sh index b75e2b4..62c2152 100755 --- a/themes/_base.sh +++ b/themes/_base.sh @@ -34,34 +34,22 @@ PROFILE_NAME="_base" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/aci.sh b/themes/aci.sh index 429e5c7..455c21c 100755 --- a/themes/aci.sh +++ b/themes/aci.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Aci" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/aco.sh b/themes/aco.sh index 40bd595..71228d3 100755 --- a/themes/aco.sh +++ b/themes/aco.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Aco" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/adventuretime.sh b/themes/adventuretime.sh index 15c6bcc..85f74bd 100755 --- a/themes/adventuretime.sh +++ b/themes/adventuretime.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Adventure Time" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/afterglow.sh b/themes/afterglow.sh index 8657336..0175668 100755 --- a/themes/afterglow.sh +++ b/themes/afterglow.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Afterglow" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/alien-blood.sh b/themes/alien-blood.sh index e997fa0..d032939 100755 --- a/themes/alien-blood.sh +++ b/themes/alien-blood.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Alien Blood" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/argonaut.sh b/themes/argonaut.sh index 78f4cf4..a89853a 100755 --- a/themes/argonaut.sh +++ b/themes/argonaut.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Argonaut" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/arthur.sh b/themes/arthur.sh index 39c3ef0..c66bb9f 100755 --- a/themes/arthur.sh +++ b/themes/arthur.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Arthur" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/atom.sh b/themes/atom.sh index 0889cfa..2a30ddc 100755 --- a/themes/atom.sh +++ b/themes/atom.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Atom" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/azu.sh b/themes/azu.sh index 759a294..d608ff8 100755 --- a/themes/azu.sh +++ b/themes/azu.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Azu" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/belafonte-day.sh b/themes/belafonte-day.sh index ffc1355..900aba5 100755 --- a/themes/belafonte-day.sh +++ b/themes/belafonte-day.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Belafonte Day" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/belafonte-night.sh b/themes/belafonte-night.sh index 5facaaa..b0f31bc 100755 --- a/themes/belafonte-night.sh +++ b/themes/belafonte-night.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Belafonte Night" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/bim.sh b/themes/bim.sh index b0bf219..9ab3ac9 100755 --- a/themes/bim.sh +++ b/themes/bim.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Bim" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/birds-of-paradise.sh b/themes/birds-of-paradise.sh index ceb1538..8c4def3 100755 --- a/themes/birds-of-paradise.sh +++ b/themes/birds-of-paradise.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Birds Of Paradise" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/blazer.sh b/themes/blazer.sh index 379968f..7b47137 100755 --- a/themes/blazer.sh +++ b/themes/blazer.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Blazer" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/borland.sh b/themes/borland.sh index a9ab2df..98f1943 100755 --- a/themes/borland.sh +++ b/themes/borland.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Borland" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/broadcast.sh b/themes/broadcast.sh index c400767..7f20c1e 100755 --- a/themes/broadcast.sh +++ b/themes/broadcast.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Broadcast" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/brogrammer.sh b/themes/brogrammer.sh index 83e7a5f..0ed208d 100755 --- a/themes/brogrammer.sh +++ b/themes/brogrammer.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Brogrammer" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/c64.sh b/themes/c64.sh index 81c1fd5..7746d05 100755 --- a/themes/c64.sh +++ b/themes/c64.sh @@ -34,32 +34,22 @@ PROFILE_NAME="C64" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/cai.sh b/themes/cai.sh index e095dd6..da31077 100755 --- a/themes/cai.sh +++ b/themes/cai.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Cai" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/chalk.sh b/themes/chalk.sh index b45b10f..51d9173 100755 --- a/themes/chalk.sh +++ b/themes/chalk.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Chalk" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/chalkboard.sh b/themes/chalkboard.sh index cac0472..a3159bf 100755 --- a/themes/chalkboard.sh +++ b/themes/chalkboard.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Chalkboard" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ciapre.sh b/themes/ciapre.sh index 0b664cc..abf5700 100755 --- a/themes/ciapre.sh +++ b/themes/ciapre.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Ciapre" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/clone-of-ubuntu.sh b/themes/clone-of-ubuntu.sh index 21f83af..4c2afd2 100755 --- a/themes/clone-of-ubuntu.sh +++ b/themes/clone-of-ubuntu.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Clone of Ubuntu" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/clrs.sh b/themes/clrs.sh index fb01cba..08a065c 100755 --- a/themes/clrs.sh +++ b/themes/clrs.sh @@ -34,32 +34,22 @@ PROFILE_NAME="CLRS" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/cobalt-neon.sh b/themes/cobalt-neon.sh index 828436f..d1f9521 100755 --- a/themes/cobalt-neon.sh +++ b/themes/cobalt-neon.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Cobalt Neon" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/cobalt2.sh b/themes/cobalt2.sh index cc20fb6..58b4f9d 100755 --- a/themes/cobalt2.sh +++ b/themes/cobalt2.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Cobalt 2" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/crayon-pony-fish.sh b/themes/crayon-pony-fish.sh index 87e30c4..a088a10 100755 --- a/themes/crayon-pony-fish.sh +++ b/themes/crayon-pony-fish.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Crayon Pony Fish" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/dark-pastel.sh b/themes/dark-pastel.sh index b665617..c13e80b 100755 --- a/themes/dark-pastel.sh +++ b/themes/dark-pastel.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Dark Pastel" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/darkside.sh b/themes/darkside.sh index b0b1986..8235198 100755 --- a/themes/darkside.sh +++ b/themes/darkside.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Darkside" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/desert.sh b/themes/desert.sh index b51ca6c..bb4c235 100755 --- a/themes/desert.sh +++ b/themes/desert.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Desert" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/dimmed-monokai.sh b/themes/dimmed-monokai.sh index fe1e592..ed4b09e 100755 --- a/themes/dimmed-monokai.sh +++ b/themes/dimmed-monokai.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Dimmed Monokai" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/dracula.sh b/themes/dracula.sh index 85a2476..16a6a54 100755 --- a/themes/dracula.sh +++ b/themes/dracula.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Dracula" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/earthsong.sh b/themes/earthsong.sh index fa831d8..ac4cc6d 100755 --- a/themes/earthsong.sh +++ b/themes/earthsong.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Earthsong" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/elemental.sh b/themes/elemental.sh index f6f7a2d..fd91ac4 100755 --- a/themes/elemental.sh +++ b/themes/elemental.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Elemental" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/elementary.sh b/themes/elementary.sh index dce129e..59cbe04 100755 --- a/themes/elementary.sh +++ b/themes/elementary.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Elementary" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/elic.sh b/themes/elic.sh index e165f5f..2749ae1 100755 --- a/themes/elic.sh +++ b/themes/elic.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Elic" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/elio.sh b/themes/elio.sh index 145dcd6..9d47285 100755 --- a/themes/elio.sh +++ b/themes/elio.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Elio" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/espresso-libre.sh b/themes/espresso-libre.sh index 33fd34d..4361e67 100755 --- a/themes/espresso-libre.sh +++ b/themes/espresso-libre.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Espresso Libre" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/espresso.sh b/themes/espresso.sh index 95904a9..3ae9d3c 100755 --- a/themes/espresso.sh +++ b/themes/espresso.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Espresso" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/fishtank.sh b/themes/fishtank.sh index 26158c5..0fcbb2f 100755 --- a/themes/fishtank.sh +++ b/themes/fishtank.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Fishtank" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/flat.sh b/themes/flat.sh index a8812e3..95f1798 100755 --- a/themes/flat.sh +++ b/themes/flat.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Flat" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/flatland.sh b/themes/flatland.sh index 867b04b..a7bcd1b 100755 --- a/themes/flatland.sh +++ b/themes/flatland.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Flatland" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/foxnightly.sh b/themes/foxnightly.sh index 1f18201..1542f41 100755 --- a/themes/foxnightly.sh +++ b/themes/foxnightly.sh @@ -35,34 +35,22 @@ PROFILE_NAME="Foxnightly" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/freya.sh b/themes/freya.sh index d22f9fb..866c771 100755 --- a/themes/freya.sh +++ b/themes/freya.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Freya" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/frontend-delight.sh b/themes/frontend-delight.sh index d20b571..c23cb88 100755 --- a/themes/frontend-delight.sh +++ b/themes/frontend-delight.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Frontend Delight" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/frontend-fun-forrest.sh b/themes/frontend-fun-forrest.sh index 1b6cccf..703f79e 100755 --- a/themes/frontend-fun-forrest.sh +++ b/themes/frontend-fun-forrest.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Frontend Fun Forrest" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/frontend-galaxy.sh b/themes/frontend-galaxy.sh index 77a358b..b12ee52 100755 --- a/themes/frontend-galaxy.sh +++ b/themes/frontend-galaxy.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Frontend Galaxy" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/github.sh b/themes/github.sh index 652f979..c697366 100755 --- a/themes/github.sh +++ b/themes/github.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Github" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/gooey.sh b/themes/gooey.sh index 2cc613b..ba56f00 100755 --- a/themes/gooey.sh +++ b/themes/gooey.sh @@ -34,34 +34,22 @@ PROFILE_NAME="gooey" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/google-dark.sh b/themes/google-dark.sh old mode 100644 new mode 100755 index b0f954c..bba92a8 --- a/themes/google-dark.sh +++ b/themes/google-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="base16: Google (dark)" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/google-light.sh b/themes/google-light.sh old mode 100644 new mode 100755 index 0b85064..47d04f3 --- a/themes/google-light.sh +++ b/themes/google-light.sh @@ -34,34 +34,22 @@ PROFILE_NAME="base16: Google (light)" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/grape.sh b/themes/grape.sh index 981da1a..a5679f5 100755 --- a/themes/grape.sh +++ b/themes/grape.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Grape" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/grass.sh b/themes/grass.sh index d44f0e9..3f291bd 100755 --- a/themes/grass.sh +++ b/themes/grass.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Grass" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/gruvbox-dark.sh b/themes/gruvbox-dark.sh index 8c01c61..12369cc 100755 --- a/themes/gruvbox-dark.sh +++ b/themes/gruvbox-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Gruvbox Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/gruvbox.sh b/themes/gruvbox.sh index e4a22a4..8328aa3 100755 --- a/themes/gruvbox.sh +++ b/themes/gruvbox.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Gruvbox" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hardcore.sh b/themes/hardcore.sh index 0d32f79..1f3a374 100755 --- a/themes/hardcore.sh +++ b/themes/hardcore.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Hardcore" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/harper.sh b/themes/harper.sh index 7cddb38..fe11ed7 100755 --- a/themes/harper.sh +++ b/themes/harper.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Harper" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hemisu-dark.sh b/themes/hemisu-dark.sh index 36c7fd5..5abc7f6 100755 --- a/themes/hemisu-dark.sh +++ b/themes/hemisu-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Hemisu Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hemisu-light.sh b/themes/hemisu-light.sh index 3a7db60..d78a17e 100755 --- a/themes/hemisu-light.sh +++ b/themes/hemisu-light.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Hemisu Light" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/highway.sh b/themes/highway.sh index a550e6c..2fce8ba 100755 --- a/themes/highway.sh +++ b/themes/highway.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Highway" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hipster-green.sh b/themes/hipster-green.sh index 67cfec1..f78d101 100755 --- a/themes/hipster-green.sh +++ b/themes/hipster-green.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Hipster Green" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/homebrew.sh b/themes/homebrew.sh index caa73e9..b70c634 100755 --- a/themes/homebrew.sh +++ b/themes/homebrew.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Homebrew" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hurtado.sh b/themes/hurtado.sh index 43be000..bab3484 100755 --- a/themes/hurtado.sh +++ b/themes/hurtado.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Hurtado" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/hybrid.sh b/themes/hybrid.sh index 36b4050..6a071f1 100755 --- a/themes/hybrid.sh +++ b/themes/hybrid.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Hybrid" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ic-green-ppl.sh b/themes/ic-green-ppl.sh index ef80277..bbda401 100755 --- a/themes/ic-green-ppl.sh +++ b/themes/ic-green-ppl.sh @@ -34,32 +34,22 @@ PROFILE_NAME="IC Green PPL" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ic-orange-ppl.sh b/themes/ic-orange-ppl.sh index 3194e98..08571aa 100755 --- a/themes/ic-orange-ppl.sh +++ b/themes/ic-orange-ppl.sh @@ -34,32 +34,22 @@ PROFILE_NAME="IC Orange PPL" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/idle-toes.sh b/themes/idle-toes.sh index 2710a47..2d84b8a 100755 --- a/themes/idle-toes.sh +++ b/themes/idle-toes.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Idle Toes" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ir-black.sh b/themes/ir-black.sh index 6940fba..f9ee7e9 100755 --- a/themes/ir-black.sh +++ b/themes/ir-black.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Ir Black" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/jackie-brown.sh b/themes/jackie-brown.sh index 14f8775..d1cf8a6 100755 --- a/themes/jackie-brown.sh +++ b/themes/jackie-brown.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Jackie Brown" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/japanesque.sh b/themes/japanesque.sh index 567c2eb..e3d54f3 100755 --- a/themes/japanesque.sh +++ b/themes/japanesque.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Japanesque" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/jellybeans.sh b/themes/jellybeans.sh index da1c34a..7cbbd6e 100755 --- a/themes/jellybeans.sh +++ b/themes/jellybeans.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Jellybeans" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/jup.sh b/themes/jup.sh index c23bd2b..0a6ed93 100755 --- a/themes/jup.sh +++ b/themes/jup.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Jup" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/kibble.sh b/themes/kibble.sh index 76bac53..2ed310b 100755 --- a/themes/kibble.sh +++ b/themes/kibble.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Kibble" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/later-this-evening.sh b/themes/later-this-evening.sh index 3d56718..ebd4cba 100755 --- a/themes/later-this-evening.sh +++ b/themes/later-this-evening.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Later This Evening" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/lavandula.sh b/themes/lavandula.sh index 3ac6e85..707c04f 100755 --- a/themes/lavandula.sh +++ b/themes/lavandula.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Lavandula" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/liquid-carbon-transparent.sh b/themes/liquid-carbon-transparent.sh index f1a284e..0761488 100755 --- a/themes/liquid-carbon-transparent.sh +++ b/themes/liquid-carbon-transparent.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Liquid Carbon Transparent" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/liquid-carbon.sh b/themes/liquid-carbon.sh index c276d57..f15703a 100755 --- a/themes/liquid-carbon.sh +++ b/themes/liquid-carbon.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Liquid Carbon" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/man-page.sh b/themes/man-page.sh index fa9fd84..6ce9163 100755 --- a/themes/man-page.sh +++ b/themes/man-page.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Man Page" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/mar.sh b/themes/mar.sh index 1ce28db..dea826f 100755 --- a/themes/mar.sh +++ b/themes/mar.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Mar" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/material.sh b/themes/material.sh index dc78dd1..07ce668 100755 --- a/themes/material.sh +++ b/themes/material.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Material" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/mathias.sh b/themes/mathias.sh index dd0c1b8..3ce1f2e 100755 --- a/themes/mathias.sh +++ b/themes/mathias.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Mathias" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/medallion.sh b/themes/medallion.sh index aba6369..1a91410 100755 --- a/themes/medallion.sh +++ b/themes/medallion.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Medallion" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/misterioso.sh b/themes/misterioso.sh index b36a968..d251104 100755 --- a/themes/misterioso.sh +++ b/themes/misterioso.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Misterioso" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/miu.sh b/themes/miu.sh index e24ec4e..83e0a81 100755 --- a/themes/miu.sh +++ b/themes/miu.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Miu" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/molokai.sh b/themes/molokai.sh index 9d6dbe6..555d4aa 100755 --- a/themes/molokai.sh +++ b/themes/molokai.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Molokai" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/mona-lisa.sh b/themes/mona-lisa.sh index fa8ff43..1913a95 100755 --- a/themes/mona-lisa.sh +++ b/themes/mona-lisa.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Mona Lisa" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/monokai-dark.sh b/themes/monokai-dark.sh index b72b651..d91560c 100755 --- a/themes/monokai-dark.sh +++ b/themes/monokai-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Monokai Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/monokai-soda.sh b/themes/monokai-soda.sh index f36dc11..e6ea323 100755 --- a/themes/monokai-soda.sh +++ b/themes/monokai-soda.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Monokai Soda" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/n0tch2k.sh b/themes/n0tch2k.sh index 47214df..8adeb18 100755 --- a/themes/n0tch2k.sh +++ b/themes/n0tch2k.sh @@ -34,32 +34,22 @@ PROFILE_NAME="N0tch2k" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/neopolitan.sh b/themes/neopolitan.sh index de410fc..82ddc9a 100755 --- a/themes/neopolitan.sh +++ b/themes/neopolitan.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Neopolitan" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nep.sh b/themes/nep.sh index 48c0da8..58a8b1f 100755 --- a/themes/nep.sh +++ b/themes/nep.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Nep" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/neutron.sh b/themes/neutron.sh index b580d62..4fe8419 100755 --- a/themes/neutron.sh +++ b/themes/neutron.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Neutron" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nightlion-v1.sh b/themes/nightlion-v1.sh index cfb27ad..e6fd2da 100755 --- a/themes/nightlion-v1.sh +++ b/themes/nightlion-v1.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Nightlion V1" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nightlion-v2.sh b/themes/nightlion-v2.sh index 79aae5f..c2923dd 100755 --- a/themes/nightlion-v2.sh +++ b/themes/nightlion-v2.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Nightlion V2" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nighty.sh b/themes/nighty.sh old mode 100644 new mode 100755 index 9457724..08c60aa --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -34,34 +34,22 @@ PROFILE_NAME="nighty" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e $PARENT_PATH"/apply-colors.sh" ] + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] then - source $PARENT_PATH"/apply-colors.sh" + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nord-light.sh b/themes/nord-light.sh index 215e478..fc11d49 100755 --- a/themes/nord-light.sh +++ b/themes/nord-light.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Nord Light" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/nord.sh b/themes/nord.sh index d8be983..839f9fc 100755 --- a/themes/nord.sh +++ b/themes/nord.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Nord" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/novel.sh b/themes/novel.sh index 4188e89..faac7b1 100755 --- a/themes/novel.sh +++ b/themes/novel.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Novel" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/obsidian.sh b/themes/obsidian.sh index 368f54b..089aa13 100755 --- a/themes/obsidian.sh +++ b/themes/obsidian.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Obsidian" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ocean-dark.sh b/themes/ocean-dark.sh index 6dce0cc..e0892ea 100755 --- a/themes/ocean-dark.sh +++ b/themes/ocean-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Ocean Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ocean.sh b/themes/ocean.sh index 38f8475..4f10d52 100755 --- a/themes/ocean.sh +++ b/themes/ocean.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Ocean" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/oceanic-next.sh b/themes/oceanic-next.sh index 01065d5..c319a25 100755 --- a/themes/oceanic-next.sh +++ b/themes/oceanic-next.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Oceanic Next" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ollie.sh b/themes/ollie.sh index 245cc43..2b920e2 100755 --- a/themes/ollie.sh +++ b/themes/ollie.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Ollie" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/one-dark.sh b/themes/one-dark.sh index 7819ac5..05d78ab 100755 --- a/themes/one-dark.sh +++ b/themes/one-dark.sh @@ -34,34 +34,22 @@ PROFILE_NAME="One Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/one-half-black.sh b/themes/one-half-black.sh index d0b4be5..0815b23 100755 --- a/themes/one-half-black.sh +++ b/themes/one-half-black.sh @@ -36,34 +36,22 @@ PROFILE_NAME="One Half Black" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/one-light.sh b/themes/one-light.sh index a610627..4cc57ed 100755 --- a/themes/one-light.sh +++ b/themes/one-light.sh @@ -34,34 +34,22 @@ PROFILE_NAME="One Light" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/pali.sh b/themes/pali.sh index 43655ed..45e0ca3 100755 --- a/themes/pali.sh +++ b/themes/pali.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Pali" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/paraiso-dark.sh b/themes/paraiso-dark.sh index 53a56aa..8102ac5 100755 --- a/themes/paraiso-dark.sh +++ b/themes/paraiso-dark.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Paraiso Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/paul-millr.sh b/themes/paul-millr.sh index 24956ff..a00da67 100755 --- a/themes/paul-millr.sh +++ b/themes/paul-millr.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Paul Millr" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/pencil-dark.sh b/themes/pencil-dark.sh index 2ab876f..d4c0116 100755 --- a/themes/pencil-dark.sh +++ b/themes/pencil-dark.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Pencil Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/pencil-light.sh b/themes/pencil-light.sh index d4411d4..c0304fc 100755 --- a/themes/pencil-light.sh +++ b/themes/pencil-light.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Pencil Light" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/peppermint.sh b/themes/peppermint.sh index 87b5a47..78a8a3b 100755 --- a/themes/peppermint.sh +++ b/themes/peppermint.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Peppermint" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/pnevma.sh b/themes/pnevma.sh index 8a12bbb..0ee80e1 100755 --- a/themes/pnevma.sh +++ b/themes/pnevma.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Pnevma" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/pro.sh b/themes/pro.sh index 59d2362..e5fe983 100755 --- a/themes/pro.sh +++ b/themes/pro.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Pro" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/red-alert.sh b/themes/red-alert.sh index 0dd8e97..e244104 100755 --- a/themes/red-alert.sh +++ b/themes/red-alert.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Red Alert" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/red-sands.sh b/themes/red-sands.sh index 0008c12..70ed85c 100755 --- a/themes/red-sands.sh +++ b/themes/red-sands.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Red Sands" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/rippedcasts.sh b/themes/rippedcasts.sh index 52c25c5..b1b141a 100755 --- a/themes/rippedcasts.sh +++ b/themes/rippedcasts.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Rippedcasts" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/royal.sh b/themes/royal.sh index 824e88b..901374d 100755 --- a/themes/royal.sh +++ b/themes/royal.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Royal" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/sat.sh b/themes/sat.sh index 3305de5..0097242 100755 --- a/themes/sat.sh +++ b/themes/sat.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Sat" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/sea-shells.sh b/themes/sea-shells.sh index 9b7bb10..151afe3 100755 --- a/themes/sea-shells.sh +++ b/themes/sea-shells.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Sea Shells" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/seafoam-pastel.sh b/themes/seafoam-pastel.sh index 8a31caf..3d697cb 100755 --- a/themes/seafoam-pastel.sh +++ b/themes/seafoam-pastel.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Seafoam Pastel" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/seti.sh b/themes/seti.sh index ce6b286..aae9229 100755 --- a/themes/seti.sh +++ b/themes/seti.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Seti" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/shaman.sh b/themes/shaman.sh index 14d7bfe..8b613eb 100755 --- a/themes/shaman.sh +++ b/themes/shaman.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Shaman" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/shel.sh b/themes/shel.sh index 6aa1062..7cb7d58 100755 --- a/themes/shel.sh +++ b/themes/shel.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Shel" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/slate.sh b/themes/slate.sh index 807b526..5d0222f 100755 --- a/themes/slate.sh +++ b/themes/slate.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Slate" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/smyck.sh b/themes/smyck.sh index 17901f7..dea28e9 100755 --- a/themes/smyck.sh +++ b/themes/smyck.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Smyck" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/snazzy.sh b/themes/snazzy.sh old mode 100644 new mode 100755 index d2ed513..a18fb2e --- a/themes/snazzy.sh +++ b/themes/snazzy.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Snazzy" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/soft-server.sh b/themes/soft-server.sh index 58e21dc..62ac75e 100755 --- a/themes/soft-server.sh +++ b/themes/soft-server.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Soft Server" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/solarized-darcula.sh b/themes/solarized-darcula.sh index ead8e03..a039d8d 100755 --- a/themes/solarized-darcula.sh +++ b/themes/solarized-darcula.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Solarized Darcula" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/solarized-dark-higher-contrast.sh b/themes/solarized-dark-higher-contrast.sh index b7fa431..813bb18 100755 --- a/themes/solarized-dark-higher-contrast.sh +++ b/themes/solarized-dark-higher-contrast.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Solarized Dark Higher Contrast" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/solarized-dark.sh b/themes/solarized-dark.sh index 8e5e091..911ed3d 100755 --- a/themes/solarized-dark.sh +++ b/themes/solarized-dark.sh @@ -31,38 +31,25 @@ PROFILE_NAME="Solarized Dark" - # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/solarized-light.sh b/themes/solarized-light.sh index cf7e530..26ab38d 100755 --- a/themes/solarized-light.sh +++ b/themes/solarized-light.sh @@ -31,38 +31,25 @@ PROFILE_NAME="Solarized Light" - # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/spacedust.sh b/themes/spacedust.sh index 75ff498..608ec02 100755 --- a/themes/spacedust.sh +++ b/themes/spacedust.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Spacedust" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/spacegray-eighties-dull.sh b/themes/spacegray-eighties-dull.sh index e40cbe1..9b2b08c 100755 --- a/themes/spacegray-eighties-dull.sh +++ b/themes/spacegray-eighties-dull.sh @@ -34,32 +34,22 @@ PROFILE_NAME="SpaceGray Eighties Dull" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/spacegray-eighties.sh b/themes/spacegray-eighties.sh index 3e8d0ae..2f7da18 100755 --- a/themes/spacegray-eighties.sh +++ b/themes/spacegray-eighties.sh @@ -34,32 +34,22 @@ PROFILE_NAME="SpaceGray Eighties" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/spacegray.sh b/themes/spacegray.sh index b23885e..0e6187e 100755 --- a/themes/spacegray.sh +++ b/themes/spacegray.sh @@ -34,32 +34,22 @@ PROFILE_NAME="SpaceGray" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/spring.sh b/themes/spring.sh index 265230f..7715709 100755 --- a/themes/spring.sh +++ b/themes/spring.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Spring" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/square.sh b/themes/square.sh index 41e6e82..4c1daa5 100755 --- a/themes/square.sh +++ b/themes/square.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Square" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/srcery.sh b/themes/srcery.sh index 3002354..01848e1 100755 --- a/themes/srcery.sh +++ b/themes/srcery.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Srcery" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/sundried.sh b/themes/sundried.sh index 4e3222c..4aaacb5 100755 --- a/themes/sundried.sh +++ b/themes/sundried.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Sundried" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/symphonic.sh b/themes/symphonic.sh index 0b70fef..7e5a21a 100755 --- a/themes/symphonic.sh +++ b/themes/symphonic.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Symphonic" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/teerb.sh b/themes/teerb.sh index 2bf31ea..60508bb 100755 --- a/themes/teerb.sh +++ b/themes/teerb.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Teerb" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/terminal-basic.sh b/themes/terminal-basic.sh index a92e3b6..6bfb7fb 100755 --- a/themes/terminal-basic.sh +++ b/themes/terminal-basic.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Terminal Basic" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/terminix-dark.sh b/themes/terminix-dark.sh index 958cc58..84fedb5 100755 --- a/themes/terminix-dark.sh +++ b/themes/terminix-dark.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Terminix Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/thayer-bright.sh b/themes/thayer-bright.sh index 3ca1d5f..16e5321 100755 --- a/themes/thayer-bright.sh +++ b/themes/thayer-bright.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Thayer Bright" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tin.sh b/themes/tin.sh index ba3d584..299acfe 100755 --- a/themes/tin.sh +++ b/themes/tin.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tin" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tomorrow-night-blue.sh b/themes/tomorrow-night-blue.sh index 53fcbee..21f755a 100755 --- a/themes/tomorrow-night-blue.sh +++ b/themes/tomorrow-night-blue.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tomorrow Night Blue" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tomorrow-night-bright.sh b/themes/tomorrow-night-bright.sh index 6822362..e3a56b1 100755 --- a/themes/tomorrow-night-bright.sh +++ b/themes/tomorrow-night-bright.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tomorrow Night Bright" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tomorrow-night-eighties.sh b/themes/tomorrow-night-eighties.sh index 25d4e6c..bfbd15c 100755 --- a/themes/tomorrow-night-eighties.sh +++ b/themes/tomorrow-night-eighties.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tomorrow Night Eighties" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tomorrow-night.sh b/themes/tomorrow-night.sh index 20831c6..23dfaef 100755 --- a/themes/tomorrow-night.sh +++ b/themes/tomorrow-night.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tomorrow Night" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/tomorrow.sh b/themes/tomorrow.sh index 18d22c3..66181ec 100755 --- a/themes/tomorrow.sh +++ b/themes/tomorrow.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Tomorrow" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/toy-chest.sh b/themes/toy-chest.sh index 305ccfb..0d7cd04 100755 --- a/themes/toy-chest.sh +++ b/themes/toy-chest.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Toy Chest" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/treehouse.sh b/themes/treehouse.sh index 4fdebd9..cf2772d 100755 --- a/themes/treehouse.sh +++ b/themes/treehouse.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Treehouse" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/twilight.sh b/themes/twilight.sh index e0d2976..465e4d9 100755 --- a/themes/twilight.sh +++ b/themes/twilight.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Twilight" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/ura.sh b/themes/ura.sh index 2c46b02..7b75190 100755 --- a/themes/ura.sh +++ b/themes/ura.sh @@ -34,34 +34,22 @@ PROFILE_NAME="Ura" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ] -then -source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/urple.sh b/themes/urple.sh index 142d4e9..c55eacd 100755 --- a/themes/urple.sh +++ b/themes/urple.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Urple" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/vag.sh b/themes/vag.sh index 1ff49af..4009fde 100755 --- a/themes/vag.sh +++ b/themes/vag.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Vag" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/vaughn.sh b/themes/vaughn.sh index e538378..286ddc7 100755 --- a/themes/vaughn.sh +++ b/themes/vaughn.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Vaughn" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/vibrant-ink.sh b/themes/vibrant-ink.sh index e1b1df5..77a8b69 100755 --- a/themes/vibrant-ink.sh +++ b/themes/vibrant-ink.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Vibrant Ink" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/warm-neon.sh b/themes/warm-neon.sh index 2922b62..ef367fd 100755 --- a/themes/warm-neon.sh +++ b/themes/warm-neon.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Warm Neon" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/wez.sh b/themes/wez.sh index 7958362..9eb6ab3 100755 --- a/themes/wez.sh +++ b/themes/wez.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Wez" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/wild-cherry.sh b/themes/wild-cherry.sh index 35499f9..e62cad3 100755 --- a/themes/wild-cherry.sh +++ b/themes/wild-cherry.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Wild Cherry" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/wombat.sh b/themes/wombat.sh index 543e65e..4886c10 100755 --- a/themes/wombat.sh +++ b/themes/wombat.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Wombat" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/wryan.sh b/themes/wryan.sh index f08093c..3097e14 100755 --- a/themes/wryan.sh +++ b/themes/wryan.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Wryan" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file diff --git a/themes/zenburn.sh b/themes/zenburn.sh index a9ca5e3..bb3290a 100755 --- a/themes/zenburn.sh +++ b/themes/zenburn.sh @@ -34,32 +34,22 @@ PROFILE_NAME="Zenburn" # =============================================================== # # | Apply Colors # ===============================================================|# -function gogh_colors () { - echo "" - echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" - echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" - echo "" -} - -function curlsource() { - f=$(mktemp -t curlsource) - curl -o "$f" -s -L "$1" - source "$f" - rm -f "$f" -} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PARENT_PATH="$(dirname "$SCRIPT_PATH")" -if [ -e $PARENT_PATH"/apply-colors.sh" ]; then - source $PARENT_PATH"/apply-colors.sh" +# Allow developer to change url to forked url for easier testing +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} + + +if [ -e "${PARENT_PATH}/apply-colors.sh" ] +then + source "${PARENT_PATH}/apply-colors.sh" else - if [ $(uname) = "Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then # OSX ships with curl and ancient bash - # Note: here, sourcing directly from curl does not work - curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + eval "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi +fi \ No newline at end of file From 61fb9583743dfb897be508b6de2bd28a14380f48 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Thu, 22 Nov 2018 14:30:40 +0100 Subject: [PATCH 14/25] Major update with tilix support --- .gitignore | 2 ++ apply-colors.sh | 64 +++++++++++++++++++++++++------------------------ gogh.sh | 2 ++ 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 7786296..72e6567 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ out.txt gh-pages/node_modules *lock* +.stfolder +apply-colors-original.sh diff --git a/apply-colors.sh b/apply-colors.sh index 76a9e0a..66b65d5 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -5,7 +5,7 @@ # | =========================================== UUIDGEN="${UUIDGEN:-$(command -v uuidgen)}" DCONF="${DCONF:-$(command -v dconf)}" -GCONF="${GCONF:-$(command -v gconftool)}" +GCONF="${GCONF:-$(command -v gconftool-2)}" GS="${GS:-$(command -v gsettings)}" case "${TERMINAL}" in @@ -26,6 +26,7 @@ case "${TERMINAL}" in touch "$CFGFILE" fi ;; + guake|tilix|mate-terminal|gnome-terminal* ) case "${TERMINAL}" in guake|gnome-terminal* ) @@ -45,10 +46,6 @@ case "${TERMINAL}" in fi ;; - * ) - printf '%s\n' "Unsupported terminal" - exit 1 - ;; esac @@ -146,7 +143,7 @@ gcset() { local key="$1"; shift local val="$1" - "$GCONFTOOL" --set --type "$type" "$PROFILE_KEY/$key" -- "$val" + "$GCONF" --set --type "$type" "$PROFILE_KEY/$key" -- "$val" } # Because gconftool doesn't have "append" @@ -158,12 +155,12 @@ glist_append() { entries="$( { - "$GCONFTOOL" --get "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" + "$GCONF" --get "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" echo "$val" } | head -c-1 | tr "\n" , )" - "$GCONFTOOL" --set --type list --list-type "$type" "$key" "[$entries]" + "$GCONF" --set --type list --list-type "$type" "$key" "[$entries]" } gset() { @@ -447,34 +444,34 @@ case "${TERMINAL}" in apply_cygwin ;; - guake|gnome-terminal* ) - if [[ -z ${DCONF} ]]; then - if [[ "${TERMINAL}" == "guake" ]]; then - apply_guake legacy - else - BASE_KEY="/apps/gnome-terminal/profiles" - apply_gtk legacy - fi + guake ) + if [[ -n "$($DCONF list /apps/guake/style/)" ]]; then + apply_guake else - if [[ "${TERMINAL}" == "guake" ]]; then - apply_guake - else - BASE_KEY="/org/gnome/terminal/legacy/profiles:" - PROFILE_LIST_KEY="${BASE_KEY}/list" - PROFILE_SLUG=":${PROFILE_SLUG}" + apply_guake legacy + fi + ;; - : ${DEFAULT_SLUG:=":$($DCONF read ${BASE_KEY}/default | tr -d \')"} - : ${DEFAULT_SLUG:=":$($DCONF list ${BASE_KEY}/ | grep '/$' | head -n1 | tr -d ':/')"} + gnome-terminal* ) + if [[ -n "$($DCONF list /org/gnome/terminal/)" ]]; then + BASE_KEY="/org/gnome/terminal/legacy/profiles:" + PROFILE_LIST_KEY="${BASE_KEY}/list" + PROFILE_SLUG=":${PROFILE_SLUG}" - echo $PROFILE_SLUG - echo $DEFAULT_SLUG + : ${DEFAULT_SLUG:=":$($DCONF read ${BASE_KEY}/default | tr -d \')"} + : ${DEFAULT_SLUG:=":$($DCONF list ${BASE_KEY}/ | grep '/$' | head -n1 | tr -d ':/')"} - LEFT_WRAPPER="[" - RIGHT_WRAPPER=] - PALETTE_DELIM="', '" + echo $PROFILE_SLUG + echo $DEFAULT_SLUG - apply_gtk - fi + LEFT_WRAPPER="[" + RIGHT_WRAPPER=] + PALETTE_DELIM="', '" + + apply_gtk + else + BASE_KEY="/apps/gnome-terminal/profiles" + apply_gtk legacy fi ;; @@ -505,6 +502,11 @@ case "${TERMINAL}" in apply_gtk ;; + * ) + printf '%s\n' "Unsupported terminal!" + exit 1 + ;; + esac unset PROFILE_NAME diff --git a/gogh.sh b/gogh.sh index 4eb3e69..a9dcb77 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -euxo pipefail + declare -a THEMES=( '3024-day.sh' '3024-night.sh' From 3e0fffd67503d6bdc9bb46a7d670a105e442a481 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 27 Nov 2018 11:09:12 +0100 Subject: [PATCH 15/25] Add support to show all themes without applying --- test/print-themes.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 test/print-themes.sh diff --git a/test/print-themes.sh b/test/print-themes.sh old mode 100644 new mode 100755 index d75b2ec..3813783 --- a/test/print-themes.sh +++ b/test/print-themes.sh @@ -245,15 +245,15 @@ set_gogh() { url="https://raw.githubusercontent.com/Mayccoll/Gogh/master/themes/$1" # Evaluate if Gogh was called from local source - i.e cloned repo - SCRIPT_PATH="$( cd "../$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - if [ -e "$SCRIPT_PATH/themes/$1" ]; then - eval "$SCRIPT_PATH/themes/$1" + SCRIPT_PATH="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")" + if [[ -e "${SCRIPT_PATH}/themes/$1" ]]; then + eval "$(<"${SCRIPT_PATH}/themes/$1")" else - if [ "$(uname)" = "Darwin" ]; then + if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl - eval "$(curl -so- "${url}")" + (eval "$(curl -so- "${url}")") else - eval "$(wget -qO- "${url}")" + (eval "$(wget -qO- "${url}")") fi fi } From 0ef494e0ae10d715b0b67d06576fe6d68a056e24 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 27 Nov 2018 11:10:12 +0100 Subject: [PATCH 16/25] Major update with tilix support --- apply-colors.sh | 451 +++++++++++++++++++++++++++--------------------- gogh.sh | 19 +- 2 files changed, 261 insertions(+), 209 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index 66b65d5..e7b50ac 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -12,7 +12,7 @@ case "${TERMINAL}" in pantheon-terminal|io.elementary.t* ) if [[ -z "${GS}" ]]; then printf '\n%s\n' "Error gsettings not found" - printf '%s\n' "sudo apt install dconf?" + printf '%s\n' "sudo apt install dconf?" printf '%s\n\n' "or export GS=/path/to/gsettings" exit 1 fi @@ -20,27 +20,27 @@ case "${TERMINAL}" in mintty ) CFGFILE="${HOME}/.minttyrc" - if [[ ! -f "$CFGFILE" ]]; then + if [[ ! -f "${CFGFILE}" ]]; then printf '\n%s\n' "Warning: Couldn't find an existing configuration file, so one will be created for you." printf '%s\n\n' "Warning: Are you really running Cygwin's mintty?" - touch "$CFGFILE" + touch "${CFGFILE}" fi ;; guake|tilix|mate-terminal|gnome-terminal* ) case "${TERMINAL}" in guake|gnome-terminal* ) - if [[ -z "${DCONF}" ]] && [[ -z "${GCONFTOOL}" ]]; then + if [[ -z "${DCONF}" ]] && [[ -z "${GCONF}" ]]; then printf '\n%s\n' "Error gconftool not found!" - printf '%s\n' "sudo apt install gconftool?" - printf '%s\n\n' "or export GCONFTOOL=/path/to/gconftool/" + printf '%s\n' "sudo apt install gconftool?" + printf '%s\n\n' "or export GCONF=/path/to/gconftool-2/" exit 1 fi ;; esac if [[ -z "${DCONF}" ]]; then printf '\n%s\n' "Error dconf not found" - printf '%s\n' "sudo apt install dconf?" + printf '%s\n' "sudo apt install dconf?" printf '%s\n\n' "or export DCONF=/path/to/dconf" exit 1 fi @@ -54,135 +54,151 @@ esac # | =========================================== gnome_color () { - AA=${1:1:2} - BB=${1:3:2} - CC=${1:5:2} + AA=${1:1:2} + BB=${1:3:2} + CC=${1:5:2} - echo "#${AA}${AA}${BB}${BB}${CC}${CC}" + echo "#${AA}${AA}${BB}${BB}${CC}${CC}" } hexToDec () { - echo "$((16#${1}))" + echo "$((16#${1}))" } hexRGBtoDecRGB () { - R="$(hexToDec "${1:1:2}")" - G="$(hexToDec "${1:3:2}")" - B="$(hexToDec "${1:5:2}")" + R="$(hexToDec "${1:1:2}")" + G="$(hexToDec "${1:3:2}")" + B="$(hexToDec "${1:5:2}")" - echo "$R" "$G" "$B" + echo "${R}" "${G}" "${B}" } convertRGBtoMac () { - set -- $(hexRGBtoDecRGB "$1") - R=$1; shift; G=$1; shift; B=$1; shift + local color="${1}" + set - + set -- $(hexRGBtoDecRGB "${color}") + R=${1}; shift; G=${1}; shift; B=${1}; shift - R=$(echo "${R} / 255" | bc -l) - G=$(echo "${G} / 255" | bc -l) - B=$(echo "${B} / 255" | bc -l) + R=$(echo "${R} / 255" | bc -l) + G=$(echo "${G} / 255" | bc -l) + B=$(echo "${B} / 255" | bc -l) - echo "$R" "$G" "$B" + echo "${R}" "${G}" "${B}" } createMinttyEntry () { - local name="$1" - local colour="$2" - set -- - set -- $(hexRGBtoDecRGB "$colour") - R=$1; shift; G=$1; shift; B=$1; shift + local name="${1}" + local color="${2}" + set - + set -- $(hexRGBtoDecRGB "${color}") + R=${1}; shift; G=${1}; shift; B=${1}; shift - echo "$name=$R,$G,$B" + echo "${name}=${R},${G},${B}" } updateMinttyConfig () { - local config="$1" - local colour="$2" - local name="$3" + local config="${1}" + local color="${2}" + local name="${3}" - sed -i -r -e "s/^${name}=.+/$(createMinttyEntry "${name}" "${colour}")/g" "${config}" - - #echo "$(cat < "${config}" | grep -v -e "^${name}=")" > "$config" - #echo -n "$(createMinttyEntry "${name}" "${colour}")" >> "$config" + sed -i -r -e "s/^${name}=.+/$(createMinttyEntry "${name}" "${color}")/g" "${config}" } convertNameAndRGBtoITerm() { - local name="$1" - local colour="$2" - set -- - set -- $(convertRGBtoMac "$colour") - R=$1; shift; G=$1; shift; B=$1; shift + local name="${1}" + local color="${2}" + set - + set -- $(convertRGBtoMac "${color}") + R=${1}; shift; G=${1}; shift; B=${1}; shift - echo "$1Blue Component${B}Green Component${G}Red Component${R}" + echo "${name}Blue Component${B}Green Component${G}Red Component${R}" } dset() { - local key="$1"; shift - local val="$1" + local key="${1}"; shift + local val="${1}" - "$DCONF" write "$PROFILE_KEY/$key" "$val" + "${DCONF}" write "${PROFILE_KEY}/${key}" "${val}" } # Because dconf still doesn't have "append" dlist_append() { - local key="$1"; shift - local val="$1"; shift - local entries + local key="${1}"; shift + local val="${1}"; shift + local entries - entries="$( - { - "$DCONF" read "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" - echo "'$val'" - } | head -c-1 | tr "\n" , - )" + entries="$( + { + "${DCONF}" read "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" + echo "'${val}'" + } | head -c-1 | tr "\n" , + )" - "$DCONF" write "$key" "[$entries]" + "${DCONF}" write "${key}" "[${entries}]" } gcset() { - local type="$1"; shift - local key="$1"; shift - local val="$1" + local type="${1}"; shift + local key="${1}"; shift + local val="${1}" - "$GCONF" --set --type "$type" "$PROFILE_KEY/$key" -- "$val" + "${GCONF}" --set --type "${type}" "${PROFILE_KEY}/${key}" -- "${val}" } # Because gconftool doesn't have "append" glist_append() { - local type="$1"; shift - local key="$1"; shift - local val="$1"; shift - local entries + local type="${1}"; shift + local key="${1}"; shift + local val="${1}"; shift + local entries - entries="$( - { - "$GCONF" --get "$key" | tr -d "[]" | tr , "\n" | grep -F -v "$val" - echo "$val" - } | head -c-1 | tr "\n" , - )" + entries="$( + { + "${GCONF}" --get "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" + echo "${val}" + } | head -c-1 | tr "\n" , + )" - "$GCONF" --set --type list --list-type "$type" "$key" "[$entries]" + "${GCONF}" --set --type list --list-type "${type}" "${key}" "[${entries}]" } gset() { - local key="$1"; shift - local val="$1" + local key="${1}"; shift + local val="${1}" - gsettings set "${PROFILE_KEY}" "${key}" "${val}" + "${GS}" set "${PROFILE_KEY}" "${key}" "${val}" } set_theme() { - dset visible-name "'${PROFILE_NAME}'" - dset background-color "'${BACKGROUND_COLOR}'" - dset foreground-color "'${FOREGROUND_COLOR}'" - if [ -n "${BOLD_COLOR}" ]; then - dset bold-color "'${BOLD_COLOR}'" - dset bold-color-same-as-fg "false" + dset visible-name "'${PROFILE_NAME}'" + dset background-color "'${BACKGROUND_COLOR}'" + dset foreground-color "'${FOREGROUND_COLOR}'" + + if [[ -n "${BOLD_COLOR:-}" ]]; then + dset bold-color "'${BOLD_COLOR}'" + dset bold-color-same-as-fg "false" else - dset bold-color "'${COLOR_08}'" - dset bold-color-same-as-fg "true" + dset bold-color "'${FOREGROUND_COLOR}'" + dset bold-color-same-as-fg "true" fi - dset use-theme-colors "false" - dset use-theme-background "false" + dset use-theme-colors "false" + dset use-theme-background "false" +} + +legacy_set_theme() { + gcset string visible_name "${PROFILE_NAME}" + gcset string background_color "${BACKGROUND_COLOR}" + gcset string foreground_color "${FOREGROUND_COLOR}" + + if [[ -n "${BOLD_COLOR:-}" ]]; then + gcset string bold_color "${BOLD_COLOR}" + gcset bool bold_color_same_as_fg "false" + else + gcset string bold_color "${FOREGROUND_COLOR}" + gcset bool bold_color_same_as_fg "true" + fi + gcset bool use_theme_colors "false" + gcset bool use_theme_background "false" } @@ -200,7 +216,7 @@ if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; t local color="COLOR_$c" set -- $(hexRGBtoDecRGB "${!color}") color_str+="\033[38;2;${1};${2};${3}m█████$(tput sgr0)" - [[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && declare DEMO_COLOR_${c}="\033[38;2;${1};${2};${3}m" + [[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && export "DEMO_COLOR_$c=\033[38;2;${1};${2};${3}m" [[ "$c" == "08" ]] && color_str+="\n" # new line done printf '\n%b\n\n\n' "${color_str}" @@ -222,20 +238,21 @@ fi # | Print theme colors # | =========================================== gogh_colors -[[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && color - -# End here if dry run was initiated -[[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && return 0 +if [[ ${GOGH_DRY_RUN:-0} -eq 1 ]]; then + color + # End here if dry run was initiated + return 0 +fi apply_elementary() { # | # | Applying values on elementary/pantheon terminal # | =========================================== - gset background "${BACKGROUND_COLOR}" - gset foreground "${FOREGROUND_COLOR}" + gset background "${BACKGROUND_COLOR}" + gset foreground "${FOREGROUND_COLOR}" gset cursor-color "${CURSOR_COLOR}" - gset palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" + gset palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" } apply_cygwin() { @@ -243,29 +260,29 @@ apply_cygwin() { # | Applying values on mintty (cygwin) # | =========================================== - echo "Patching mintty configuration file (${CFGFILE}) with new colours..." + echo "Patching mintty configuration file (${CFGFILE}) with new colors..." - updateMinttyConfig "$CFGFILE" "$COLOR_01" "Black" - updateMinttyConfig "$CFGFILE" "$COLOR_02" "Red" - updateMinttyConfig "$CFGFILE" "$COLOR_03" "Green" - updateMinttyConfig "$CFGFILE" "$COLOR_04" "Yellow" - updateMinttyConfig "$CFGFILE" "$COLOR_05" "Blue" - updateMinttyConfig "$CFGFILE" "$COLOR_06" "Magenta" - updateMinttyConfig "$CFGFILE" "$COLOR_07" "Cyan" - updateMinttyConfig "$CFGFILE" "$COLOR_08" "White" + updateMinttyConfig "$CFGFILE" "$COLOR_01" "Black" + updateMinttyConfig "$CFGFILE" "$COLOR_02" "Red" + updateMinttyConfig "$CFGFILE" "$COLOR_03" "Green" + updateMinttyConfig "$CFGFILE" "$COLOR_04" "Yellow" + updateMinttyConfig "$CFGFILE" "$COLOR_05" "Blue" + updateMinttyConfig "$CFGFILE" "$COLOR_06" "Magenta" + updateMinttyConfig "$CFGFILE" "$COLOR_07" "Cyan" + updateMinttyConfig "$CFGFILE" "$COLOR_08" "White" - updateMinttyConfig "$CFGFILE" "$COLOR_09" "BoldBlack" - updateMinttyConfig "$CFGFILE" "$COLOR_10" "BoldRed" - updateMinttyConfig "$CFGFILE" "$COLOR_11" "BoldGreen" - updateMinttyConfig "$CFGFILE" "$COLOR_12" "BoldYellow" - updateMinttyConfig "$CFGFILE" "$COLOR_13" "BoldBlue" - updateMinttyConfig "$CFGFILE" "$COLOR_14" "BoldMagenta" - updateMinttyConfig "$CFGFILE" "$COLOR_15" "BoldCyan" - updateMinttyConfig "$CFGFILE" "$COLOR_16" "BoldWhite" + updateMinttyConfig "$CFGFILE" "$COLOR_09" "BoldBlack" + updateMinttyConfig "$CFGFILE" "$COLOR_10" "BoldRed" + updateMinttyConfig "$CFGFILE" "$COLOR_11" "BoldGreen" + updateMinttyConfig "$CFGFILE" "$COLOR_12" "BoldYellow" + updateMinttyConfig "$CFGFILE" "$COLOR_13" "BoldBlue" + updateMinttyConfig "$CFGFILE" "$COLOR_14" "BoldMagenta" + updateMinttyConfig "$CFGFILE" "$COLOR_15" "BoldCyan" + updateMinttyConfig "$CFGFILE" "$COLOR_16" "BoldWhite" - updateMinttyConfig "$CFGFILE" "$BACKGROUND_COLOR" "BackgroundColour" - updateMinttyConfig "$CFGFILE" "$FOREGROUND_COLOR" "ForegroundColour" - updateMinttyConfig "$CFGFILE" "$CURSOR_COLOR" "CursorColour" + updateMinttyConfig "$CFGFILE" "$BACKGROUND_COLOR" "Backgroundcolor" + updateMinttyConfig "$CFGFILE" "$FOREGROUND_COLOR" "Foregroundcolor" + updateMinttyConfig "$CFGFILE" "$CURSOR_COLOR" "Cursorcolor" echo "Done - please reopen your Cygwin terminal to see the changes" } @@ -277,30 +294,30 @@ apply_darwin() { BACKGROUND_COLOR=$(convertNameAndRGBtoITerm "Background Color" "$BACKGROUND_COLOR") FOREGROUND_COLOR=$(convertNameAndRGBtoITerm "Foreground Color" "$FOREGROUND_COLOR") - COLOR_01=$(convertNameAndRGBtoITerm "Ansi 0 Color" "$COLOR_01") - COLOR_02=$(convertNameAndRGBtoITerm "Ansi 1 Color" "$COLOR_02") - COLOR_03=$(convertNameAndRGBtoITerm "Ansi 2 Color" "$COLOR_03") - COLOR_04=$(convertNameAndRGBtoITerm "Ansi 3 Color" "$COLOR_04") - COLOR_05=$(convertNameAndRGBtoITerm "Ansi 4 Color" "$COLOR_05") - COLOR_06=$(convertNameAndRGBtoITerm "Ansi 5 Color" "$COLOR_06") - COLOR_07=$(convertNameAndRGBtoITerm "Ansi 6 Color" "$COLOR_07") - COLOR_08=$(convertNameAndRGBtoITerm "Ansi 7 Color" "$COLOR_08") - COLOR_09=$(convertNameAndRGBtoITerm "Ansi 8 Color" "$COLOR_09") - COLOR_10=$(convertNameAndRGBtoITerm "Ansi 9 Color" "$COLOR_10") - COLOR_11=$(convertNameAndRGBtoITerm "Ansi 10 Color" "$COLOR_11") - COLOR_12=$(convertNameAndRGBtoITerm "Ansi 11 Color" "$COLOR_12") - COLOR_13=$(convertNameAndRGBtoITerm "Ansi 12 Color" "$COLOR_13") - COLOR_14=$(convertNameAndRGBtoITerm "Ansi 13 Color" "$COLOR_14") - COLOR_15=$(convertNameAndRGBtoITerm "Ansi 14 Color" "$COLOR_15") - COLOR_16=$(convertNameAndRGBtoITerm "Ansi 15 Color" "$COLOR_16") + COLOR_01=$(convertNameAndRGBtoITerm "Ansi 0 Color" "$COLOR_01") + COLOR_02=$(convertNameAndRGBtoITerm "Ansi 1 Color" "$COLOR_02") + COLOR_03=$(convertNameAndRGBtoITerm "Ansi 2 Color" "$COLOR_03") + COLOR_04=$(convertNameAndRGBtoITerm "Ansi 3 Color" "$COLOR_04") + COLOR_05=$(convertNameAndRGBtoITerm "Ansi 4 Color" "$COLOR_05") + COLOR_06=$(convertNameAndRGBtoITerm "Ansi 5 Color" "$COLOR_06") + COLOR_07=$(convertNameAndRGBtoITerm "Ansi 6 Color" "$COLOR_07") + COLOR_08=$(convertNameAndRGBtoITerm "Ansi 7 Color" "$COLOR_08") + COLOR_09=$(convertNameAndRGBtoITerm "Ansi 8 Color" "$COLOR_09") + COLOR_10=$(convertNameAndRGBtoITerm "Ansi 9 Color" "$COLOR_10") + COLOR_11=$(convertNameAndRGBtoITerm "Ansi 10 Color" "$COLOR_11") + COLOR_12=$(convertNameAndRGBtoITerm "Ansi 11 Color" "$COLOR_12") + COLOR_13=$(convertNameAndRGBtoITerm "Ansi 12 Color" "$COLOR_13") + COLOR_14=$(convertNameAndRGBtoITerm "Ansi 13 Color" "$COLOR_14") + COLOR_15=$(convertNameAndRGBtoITerm "Ansi 14 Color" "$COLOR_15") + COLOR_16=$(convertNameAndRGBtoITerm "Ansi 15 Color" "$COLOR_16") # Assemble color scheme file contents ITERMCOLORS=''${BACKGROUND_COLOR}${FOREGROUND_COLOR}${COLOR_01}${COLOR_02}${COLOR_03}${COLOR_04}${COLOR_05}${COLOR_06}${COLOR_07}${COLOR_08}${COLOR_09}${COLOR_10}${COLOR_11}${COLOR_12}${COLOR_13}${COLOR_14}${COLOR_15}'' # Dump iTerm color scheme to file and import it by opening it - echo "$ITERMCOLORS" > "${PROFILE_NAME}.itermcolors" + echo "${ITERMCOLORS}" > "${PROFILE_NAME}.itermcolors" open "${PROFILE_NAME}.itermcolors" - rm "${PROFILE_NAME}.itermcolors" + rm "${PROFILE_NAME}.itermcolors" } apply_gtk() { @@ -308,67 +325,82 @@ apply_gtk() { # | Applying values to gnome/mate/tilix # | =========================================== - local legacy="$1" + local legacy="${1:-}" + + # This is to avoid doing the profile loop definition twice + if [[ -z "${legacy}" ]]; then + CONFTOOL="${DCONF} read" + VISIBLE_NAME="visible-name" + else + CONFTOOL="${GCONF} --get" + VISIBLE_NAME="visible_name" + fi + + # Check first wether profile already exists + profile_hashes=($(${CONFTOOL} "${PROFILE_LIST_KEY}" | tr "[]'," " ")) + for profile in "${profile_hashes[@]}"; do + if [[ "$(${CONFTOOL} "${BASE_DIR}${profile}/${VISIBLE_NAME}" | tr -d "'")" == "${PROFILE_NAME}" ]]; then + printf '%s\n' "Profile already exists" "Skipping..." + exit 0 + fi + done + + # Fallback if there is no default profile + set -- $(${CONFTOOL} ${PROFILE_LIST_KEY} | tr "[]'," " ") + : ${DEFAULT_SLUG:="$1"} : ${PROFILE_NAME:="Default"} : ${PROFILE_SLUG:="Default"} - DEFAULT_KEY="${BASE_KEY}/${DEFAULT_SLUG}" - PROFILE_KEY="${BASE_KEY}/${PROFILE_SLUG}" + DEFAULT_KEY="${BASE_DIR}${DEFAULT_SLUG:-}" + PROFILE_KEY="${BASE_DIR}${PROFILE_SLUG:-}" if [[ -z "${legacy}" ]]; then - if [[ -z "$($DCONF list ${BASE_KEY}/)" ]]; then + if [[ -z "$(${DCONF} list ${BASE_DIR%:})" ]]; then # Provide a user friendly error text if no saved profile exists, otherwise it will display "Error gconftool not found!" # it could happen on a newly installed system. (happened on CentOS 7) - echo "Error, no saved profiles found!" - echo "Possible fix, new a profile (Terminal > Edit > Preferences > Profiles > New, then Close) and try again." - echo "You can safely delete the created profile after the installation." + printf '%s\n' \ + "Error, no saved profiles found!" \ + "Possible fix, new a profile (Terminal > Edit > Preferences > Profiles > New, then Close) and try again." \ + "You can safely delete the created profile after the installation." exit 1 fi BACKGROUND_COLOR=$(gnome_color "$BACKGROUND_COLOR") FOREGROUND_COLOR=$(gnome_color "$FOREGROUND_COLOR") - COLOR_01=$(gnome_color "$COLOR_01") - COLOR_02=$(gnome_color "$COLOR_02") - COLOR_03=$(gnome_color "$COLOR_03") - COLOR_04=$(gnome_color "$COLOR_04") - COLOR_05=$(gnome_color "$COLOR_05") - COLOR_06=$(gnome_color "$COLOR_06") - COLOR_07=$(gnome_color "$COLOR_07") - COLOR_08=$(gnome_color "$COLOR_08") - COLOR_09=$(gnome_color "$COLOR_09") - COLOR_10=$(gnome_color "$COLOR_10") - COLOR_11=$(gnome_color "$COLOR_11") - COLOR_12=$(gnome_color "$COLOR_12") - COLOR_13=$(gnome_color "$COLOR_13") - COLOR_14=$(gnome_color "$COLOR_14") - COLOR_15=$(gnome_color "$COLOR_15") - COLOR_16=$(gnome_color "$COLOR_16") + COLOR_01=$(gnome_color "$COLOR_01") + COLOR_02=$(gnome_color "$COLOR_02") + COLOR_03=$(gnome_color "$COLOR_03") + COLOR_04=$(gnome_color "$COLOR_04") + COLOR_05=$(gnome_color "$COLOR_05") + COLOR_06=$(gnome_color "$COLOR_06") + COLOR_07=$(gnome_color "$COLOR_07") + COLOR_08=$(gnome_color "$COLOR_08") + COLOR_09=$(gnome_color "$COLOR_09") + COLOR_10=$(gnome_color "$COLOR_10") + COLOR_11=$(gnome_color "$COLOR_11") + COLOR_12=$(gnome_color "$COLOR_12") + COLOR_13=$(gnome_color "$COLOR_13") + COLOR_14=$(gnome_color "$COLOR_14") + COLOR_15=$(gnome_color "$COLOR_15") + COLOR_16=$(gnome_color "$COLOR_16") # copy existing settings from default profile - $DCONF dump "${DEFAULT_KEY}/" | $DCONF load "${PROFILE_KEY}/" - echo $DEFAULT_KEY - echo $PROFILE_KEY + $DCONF dump "${DEFAULT_KEY}/" | $DCONF load "${PROFILE_KEY}/" # add new copy to global list of profiles - dlist_append "${PROFILE_LIST_KEY}" "${PROFILE_SLUG#:}" + dlist_append "${PROFILE_LIST_KEY}" "${PROFILE_SLUG#:}" set_theme - dset palette "${LEFT_WRAPPER:-}'${COLOR_01}${PALETTE_DELIM}${COLOR_02}${PALETTE_DELIM}${COLOR_03}${PALETTE_DELIM}${COLOR_04}${PALETTE_DELIM}${COLOR_05}${PALETTE_DELIM}${COLOR_06}${PALETTE_DELIM}${COLOR_07}${PALETTE_DELIM}${COLOR_08}${PALETTE_DELIM}${COLOR_09}${PALETTE_DELIM}${COLOR_10}${PALETTE_DELIM}${COLOR_11}${PALETTE_DELIM}${COLOR_12}${PALETTE_DELIM}${COLOR_13}${PALETTE_DELIM}${COLOR_14}${PALETTE_DELIM}${COLOR_15}${PALETTE_DELIM}${COLOR_16}'${RIGHT_WRAPPER:-}" - - dset allow-bold "true" #mate guake + dset palette "${LEFT_WRAPPER:-}'${COLOR_01}${PALETTE_DELIM}${COLOR_02}${PALETTE_DELIM}${COLOR_03}${PALETTE_DELIM}${COLOR_04}${PALETTE_DELIM}${COLOR_05}${PALETTE_DELIM}${COLOR_06}${PALETTE_DELIM}${COLOR_07}${PALETTE_DELIM}${COLOR_08}${PALETTE_DELIM}${COLOR_09}${PALETTE_DELIM}${COLOR_10}${PALETTE_DELIM}${COLOR_11}${PALETTE_DELIM}${COLOR_12}${PALETTE_DELIM}${COLOR_13}${PALETTE_DELIM}${COLOR_14}${PALETTE_DELIM}${COLOR_15}${PALETTE_DELIM}${COLOR_16}'${RIGHT_WRAPPER:-}" + ${LEGACY_BOLD:-} && dset allow-bold "true" # mate else # Append the Base16 profile to the profile list - glist_append string "${PROFILE_LIST_KEY}" "$PROFILE_SLUG" + glist_append string "${PROFILE_LIST_KEY}" "${PROFILE_SLUG}" - gcset string visible_name "{$PROFILE_NAME}" - gcset string palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" - gcset string background_color "${BACKGROUND_COLOR}" - gcset string foreground_color "${FOREGROUND_COLOR}" - gcset string bold_color "${FOREGROUND_COLOR}" - gcset bool bold_color_same_as_fg "true" - gcset bool use_theme_colors "false" - gcset bool use_theme_background "false" + legacy_set_theme + gcset string palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" + ${LEGACY_BOLD:-} && gcset bool allow-bold "true" fi } @@ -377,40 +409,44 @@ apply_guake() { # | Applying values to guake # | =========================================== - local legacy="$1" + local legacy="${1:-}" PROFILE_KEY="/apps/guake/style/font" if [[ -z "${legacy}" ]]; then - dset palette "'${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}:${FOREGROUND_COLOR}:${BACKGROUND_COLOR}'" - dset palette-name "'${PROFILE_NAME}'" + dset palette "'${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}:${FOREGROUND_COLOR}:${BACKGROUND_COLOR}'" + dset palette-name "'${PROFILE_NAME}'" dset allow-bold 'true' else - gcset string color "${FOREGROUND_COLOR}" - gcset string palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" + gcset string color "${FOREGROUND_COLOR}" + gcset string palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" gcset string palette-name "${PROFILE_NAME}" PROFILE_KEY="/apps/guake/style/background" - gcset string color "${BACKGROUND_COLOR}" + gcset string color "${BACKGROUND_COLOR}" fi } appy_tilixschemes() { + # | + # | Applying values to tilix colorschemes + # | =========================================== + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - [[ -d "$HOME/.config/tilix/schemes" ]] || mkdir -p "${HOME}/.config/tilix/schemes" + [[ -d "${HOME}/.config/tilix/schemes" ]] || mkdir -p "${HOME}/.config/tilix/schemes" TILIXCOLORS='{\n\t"name": "'${PROFILE_NAME}'",\n\t"comment": "Generated by Gogh",\n\t"foreground-color": "'${FOREGROUND_COLOR}'",\n\t"background-color":"'${BACKGROUND_COLOR}'",\n\t"cursor-background-color": "'${CURSOR_COLOR}'",\n\t"palette": [\n\t\t"'${COLOR_01}'",\n\t\t"'${COLOR_02}'",\n\t\t"'${COLOR_03}'",\n\t\t"'${COLOR_04}'",\n\t\t"'${COLOR_05}'",\n\t\t"'${COLOR_06}'",\n\t\t"'${COLOR_07}'",\n\t\t"'${COLOR_08}'",\n\t\t"'${COLOR_09}'",\n\t\t"'${COLOR_10}'",\n\t\t"'${COLOR_11}'",\n\t\t"'${COLOR_12}'",\n\t\t"'${COLOR_13}'",\n\t\t"'${COLOR_14}'",\n\t\t"'${COLOR_15}'",\n\t\t"'${COLOR_16}'"\n\t],\n\t"use-badge-color": false,\n\t"use-bold-color": false,\n\t"use-cursor-color": false,\n\t"use-highlight-color": false,\n\t"use-theme-colors": false\n}' - echo -e "$TILIXCOLORS" > "${scratchdir}/${PROFILE_NAME}.json" + echo -e "${TILIXCOLORS}" > "${scratchdir}/${PROFILE_NAME}.json" # Note: Tilix does not store color scheme name in dconf # so we have to update color palette for the current profile in order to switch to the new theme # but only set the palette on the last loop to avoid a flashing terminal if ((LOOP == OPTLENGTH)); then - cp -f "${scratchdir}"/* "$HOME/.config/tilix/schemes/" + cp -f ${scratchdir}/* "$HOME/.config/tilix/schemes/" rm -rf "${scratchdir}" read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - PROFILE_KEY="${BASE_KEY}/${DEFAULT_SLUG}" - PROFILE_NAME="$($DCONF read ${PROFILE_KEY}/visible-name | tr -d \')" + PROFILE_KEY="${BASE_DIR}${DEFAULT_SLUG}" + PROFILE_NAME="$(${DCONF} read ${PROFILE_KEY}/visible-name | tr -d \')" set_theme dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" fi @@ -445,7 +481,7 @@ case "${TERMINAL}" in ;; guake ) - if [[ -n "$($DCONF list /apps/guake/style/)" ]]; then + if [[ -n "$(${DCONF} list /apps/guake/style/)" ]]; then apply_guake else apply_guake legacy @@ -453,34 +489,37 @@ case "${TERMINAL}" in ;; gnome-terminal* ) - if [[ -n "$($DCONF list /org/gnome/terminal/)" ]]; then - BASE_KEY="/org/gnome/terminal/legacy/profiles:" - PROFILE_LIST_KEY="${BASE_KEY}/list" - PROFILE_SLUG=":${PROFILE_SLUG}" + if [[ -n "$(${DCONF} list /org/gnome/terminal/)" ]]; then + BASE_DIR="/org/gnome/terminal/legacy/profiles:/:" + PROFILE_LIST_KEY="${BASE_DIR%:}list" + PROFILE_SLUG="${PROFILE_SLUG}" - : ${DEFAULT_SLUG:=":$($DCONF read ${BASE_KEY}/default | tr -d \')"} - : ${DEFAULT_SLUG:=":$($DCONF list ${BASE_KEY}/ | grep '/$' | head -n1 | tr -d ':/')"} - - echo $PROFILE_SLUG - echo $DEFAULT_SLUG + # Note -- ${BASE_DIR%s} is a workaround to avoid doing additional conditional testing for existing profiles + # if terminal is set to gnome-terminal + : ${DEFAULT_SLUG:="$(${DCONF} read ${BASE_DIR%:}default | tr -d \')"} LEFT_WRAPPER="[" - RIGHT_WRAPPER=] + RIGHT_WRAPPER="]" PALETTE_DELIM="', '" apply_gtk else - BASE_KEY="/apps/gnome-terminal/profiles" + BASE_DIR="/apps/gnome-terminal/profiles/" + PROFILE_LIST_KEY="${BASE_DIR/profiles/global}profile_list" + LEGACY_BOLD=true + + : ${DEFAULT_SLUG:="$(${GCONF} read ${BASE_DIR}default_profile)"} + apply_gtk legacy fi ;; mate-terminal ) - BASE_KEY="/org/mate/terminal/profiles" - PROFILE_LIST_KEY="${BASE_KEY/profiles/global}/profile-list" + BASE_DIR="/org/mate/terminal/profiles/" + PROFILE_LIST_KEY="${BASE_DIR/profiles/global}profile-list" + LEGACY_BOLD=true - : ${DEFAULT_SLUG:="$($DCONF read ${BASE_KEY/profiles/global}/default-profile | tr -d \')"} - : ${DEFAULT_SLUG:="$($DCONF list ${BASE_KEY}/ | grep '/$' | head -n1 | tr -d '/')"} + : ${DEFAULT_SLUG:="$(${DCONF} read ${BASE_DIR/profiles/global}default-profile | tr -d \')"} PALETTE_DELIM=":" @@ -488,14 +527,13 @@ case "${TERMINAL}" in ;; tilix ) - BASE_KEY="/com/gexperts/Tilix/profiles" - PROFILE_LIST_KEY="${BASE_KEY}/list" + BASE_DIR="/com/gexperts/Tilix/profiles/" + PROFILE_LIST_KEY="${BASE_DIR}list" - : ${DEFAULT_SLUG:="$($DCONF read ${BASE_KEY}/default | tr -d \')"} - : ${DEFAULT_SLUG:="$($DCONF list ${BASE_KEY}/ | grep '/$' | head -n1 | tr -d '/')"} + : ${DEFAULT_SLUG:="$(${DCONF} read ${BASE_DIR}default | tr -d \')"} LEFT_WRAPPER="[" - RIGHT_WRAPPER=] + RIGHT_WRAPPER="]" PALETTE_DELIM="', '" appy_tilixschemes @@ -503,7 +541,20 @@ case "${TERMINAL}" in ;; * ) - printf '%s\n' "Unsupported terminal!" + printf '%s\n' \ + "Unsupported terminal!" \ + "" \ + "Supported terminals:" \ + " mintty and deriviates" \ + " guake" \ + " iTerm2" \ + " elementary terminal (pantheon/elementary)" \ + " mate-terminal" \ + " gnome-terminal" \ + " tilix" \ + "" \ + "If you believe you have recieved this message in error," \ + "try manually setting \`TERMINAL', hint: ps -h -o comm -p \$PPID" exit 1 ;; diff --git a/gogh.sh b/gogh.sh index a9dcb77..5213b8a 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash - -set -euxo pipefail - +set -euo pipefail +export SHELLOPTS declare -a THEMES=( '3024-day.sh' '3024-night.sh' @@ -203,10 +202,12 @@ set_gogh() { # Evaluate if Gogh was called from local source - i.e cloned repo SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - if [ -e "$SCRIPT_PATH/themes/$1" ]; then - (eval "$SCRIPT_PATH/themes/$1") + # This is to handle dirs with spaces in their names + printf -v SCRIPT_PATH "'%s'" "${SCRIPT_PATH}" + if [[ -e "${SCRIPT_PATH}/themes/$1" ]]; then + (eval "${SCRIPT_PATH}/themes/$1") else - if [ "$(uname)" = "Darwin" ]; then + if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl (eval "$(curl -sLo- "${url}")") else @@ -250,7 +251,7 @@ if [[ ${COLUMNS:-$(tput cols)} -ge 80 ]]; then gogh_str+=" " - echo -e "${gogh_str}" + printf '%b\n' "${gogh_str}" #sleep 2.5 else echo -e "\nGogh\n" @@ -298,9 +299,9 @@ if [[ -z "${TERMINAL:-}" ]]; then # | Check for the terminal name (depening on os) # | =========================================== OS="$(uname)" - if [ "$OS" = "Darwin" ]; then + if [[ "$OS" = "Darwin" ]]; then TERMINAL=$TERM_PROGRAM - elif [ "${OS#CYGWIN}" != "${OS}" ]; then + elif [[ "${OS#CYGWIN}" != "${OS}" ]]; then TERMINAL="mintty" else # | From e8195e927b4e6eeaa4dd49e4e333cfc7081facb6 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 27 Nov 2018 21:11:23 +0100 Subject: [PATCH 17/25] Showcase themes without applying the theme --- test/print-themes.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/print-themes.sh b/test/print-themes.sh index 3813783..ceeb1af 100755 --- a/test/print-themes.sh +++ b/test/print-themes.sh @@ -270,11 +270,11 @@ else eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null fi -bar::start 2> /dev/null +command -v bar::start > /dev/null && bar::start for THEME in "${THEMES[@]}"; do LOOP=$((${LOOP:-(-1)}+1)) - bar::status_changed $LOOP ${#THEMES[@]} 2> /dev/null + command -v bar::status_changed > /dev/null && bar::status_changed $LOOP ${#THEMES[@]} FILENAME=$(remove_file_extension "${THEME}") FILENAME_SPACE="${FILENAME//-/ }" @@ -288,8 +288,8 @@ for THEME in "${THEMES[@]}"; do done LOOP=$((${LOOP:-(-1)}+1)) -bar::status_changed $LOOP ${#THEMES[@]} 2> /dev/null +command -v bar::stop > /dev/null && bar::status_changed $LOOP ${#THEMES[@]} -bar::stop 2> /dev/null +command -v bar::stop > /dev/null && bar::stop unset GOGH_DRY_RUN \ No newline at end of file From 851ac59dfd2e8c616d99798ec1a4da275d7cf791 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Tue, 27 Nov 2018 21:11:54 +0100 Subject: [PATCH 18/25] Major update with tilix support --- apply-colors.sh | 18 ++++++++++-------- gogh.sh | 3 +-- 2 files changed, 11 insertions(+), 10 deletions(-) mode change 100755 => 100644 apply-colors.sh diff --git a/apply-colors.sh b/apply-colors.sh old mode 100755 new mode 100644 index e7b50ac..e3b6fa4 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -3,10 +3,12 @@ # | # | Early pre-requisites check # | =========================================== -UUIDGEN="${UUIDGEN:-$(command -v uuidgen)}" -DCONF="${DCONF:-$(command -v dconf)}" -GCONF="${GCONF:-$(command -v gconftool-2)}" -GS="${GS:-$(command -v gsettings)}" +UUIDGEN="${UUIDGEN:-$(command -v uuidgen | xargs echo)}" +DCONF="${DCONF:-$(command -v dconf | xargs echo)}" +GCONF="${GCONF:-$(command -v gconftool-2 | xargs echo)}" +GS="${GS:-$(command -v gsettings | xargs echo)}" +# Note: xargs echo is to make the command sucessful even if it was not +# otherwise the script will exit if the command does not exist (elementary os) case "${TERMINAL}" in pantheon-terminal|io.elementary.t* ) @@ -175,11 +177,11 @@ set_theme() { dset foreground-color "'${FOREGROUND_COLOR}'" if [[ -n "${BOLD_COLOR:-}" ]]; then - dset bold-color "'${BOLD_COLOR}'" - dset bold-color-same-as-fg "false" + dset bold-color "'${BOLD_COLOR}'" + dset bold-color-same-as-fg "false" else - dset bold-color "'${FOREGROUND_COLOR}'" - dset bold-color-same-as-fg "true" + dset bold-color "'${FOREGROUND_COLOR}'" + dset bold-color-same-as-fg "true" fi dset use-theme-colors "false" dset use-theme-background "false" diff --git a/gogh.sh b/gogh.sh index 88783a2..0212fd4 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -euo pipefail -export SHELLOPTS + declare -a THEMES=( '3024-day.sh' '3024-night.sh' From cd200b7a41ea78c31f44dc85a51cdf681d82b426 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Thu, 29 Nov 2018 21:48:25 +0100 Subject: [PATCH 19/25] Major update with tilix support --- apply-colors.sh | 238 +++++----- gogh.sh | 534 +++++++++++------------ test/print-themes.sh | 476 ++++++++++---------- test/test.sh | 94 ++-- themes/3024-day.sh | 63 ++- themes/3024-night.sh | 63 ++- themes/README.md | 12 +- themes/_base.sh | 63 ++- themes/aci.sh | 63 ++- themes/aco.sh | 63 ++- themes/adventuretime.sh | 63 ++- themes/afterglow.sh | 63 ++- themes/alien-blood.sh | 63 ++- themes/argonaut.sh | 63 ++- themes/arthur.sh | 63 ++- themes/atom.sh | 63 ++- themes/azu.sh | 63 ++- themes/belafonte-day.sh | 63 ++- themes/belafonte-night.sh | 63 ++- themes/bim.sh | 63 ++- themes/birds-of-paradise.sh | 63 ++- themes/blazer.sh | 63 ++- themes/borland.sh | 63 ++- themes/broadcast.sh | 63 ++- themes/brogrammer.sh | 63 ++- themes/c64.sh | 63 ++- themes/cai.sh | 63 ++- themes/chalk.sh | 63 ++- themes/chalkboard.sh | 63 ++- themes/ciapre.sh | 63 ++- themes/clone-of-ubuntu.sh | 63 ++- themes/clrs.sh | 63 ++- themes/cobalt-neon.sh | 63 ++- themes/cobalt2.sh | 63 ++- themes/crayon-pony-fish.sh | 63 ++- themes/dark-pastel.sh | 63 ++- themes/darkside.sh | 63 ++- themes/desert.sh | 63 ++- themes/dimmed-monokai.sh | 63 ++- themes/dracula.sh | 63 ++- themes/earthsong.sh | 63 ++- themes/elemental.sh | 63 ++- themes/elementary.sh | 63 ++- themes/elic.sh | 63 ++- themes/elio.sh | 63 ++- themes/espresso-libre.sh | 63 ++- themes/espresso.sh | 63 ++- themes/fishtank.sh | 63 ++- themes/flat.sh | 63 ++- themes/flatland.sh | 63 ++- themes/foxnightly.sh | 63 ++- themes/freya.sh | 63 ++- themes/frontend-delight.sh | 63 ++- themes/frontend-fun-forrest.sh | 63 ++- themes/frontend-galaxy.sh | 63 ++- themes/github.sh | 63 ++- themes/gooey.sh | 63 ++- themes/google-dark.sh | 63 ++- themes/google-light.sh | 63 ++- themes/grape.sh | 63 ++- themes/grass.sh | 63 ++- themes/gruvbox-dark.sh | 63 ++- themes/gruvbox.sh | 63 ++- themes/hardcore.sh | 63 ++- themes/harper.sh | 63 ++- themes/hemisu-dark.sh | 63 ++- themes/hemisu-light.sh | 63 ++- themes/highway.sh | 63 ++- themes/hipster-green.sh | 63 ++- themes/homebrew.sh | 63 ++- themes/hurtado.sh | 63 ++- themes/hybrid.sh | 63 ++- themes/ic-green-ppl.sh | 63 ++- themes/ic-orange-ppl.sh | 63 ++- themes/idle-toes.sh | 63 ++- themes/ir-black.sh | 63 ++- themes/jackie-brown.sh | 63 ++- themes/japanesque.sh | 63 ++- themes/jellybeans.sh | 63 ++- themes/jup.sh | 63 ++- themes/kibble.sh | 63 ++- themes/later-this-evening.sh | 63 ++- themes/lavandula.sh | 63 ++- themes/liquid-carbon-transparent.sh | 63 ++- themes/liquid-carbon.sh | 63 ++- themes/man-page.sh | 63 ++- themes/mar.sh | 63 ++- themes/material.sh | 63 ++- themes/mathias.sh | 63 ++- themes/medallion.sh | 63 ++- themes/misterioso.sh | 63 ++- themes/miu.sh | 63 ++- themes/molokai.sh | 63 ++- themes/mona-lisa.sh | 63 ++- themes/monokai-dark.sh | 63 ++- themes/monokai-soda.sh | 63 ++- themes/n0tch2k.sh | 63 ++- themes/neopolitan.sh | 63 ++- themes/nep.sh | 63 ++- themes/neutron.sh | 63 ++- themes/nightlion-v1.sh | 63 ++- themes/nightlion-v2.sh | 63 ++- themes/nighty.sh | 63 ++- themes/nord-light.sh | 63 ++- themes/nord.sh | 63 ++- themes/novel.sh | 63 ++- themes/obsidian.sh | 63 ++- themes/ocean-dark.sh | 63 ++- themes/ocean.sh | 63 ++- themes/oceanic-next.sh | 63 ++- themes/ollie.sh | 63 ++- themes/one-dark.sh | 63 ++- themes/one-half-black.sh | 63 ++- themes/one-light.sh | 63 ++- themes/pali.sh | 63 ++- themes/paraiso-dark.sh | 63 ++- themes/paul-millr.sh | 63 ++- themes/pencil-dark.sh | 63 ++- themes/pencil-light.sh | 63 ++- themes/peppermint.sh | 63 ++- themes/pnevma.sh | 63 ++- themes/pro.sh | 63 ++- themes/red-alert.sh | 63 ++- themes/red-sands.sh | 63 ++- themes/rippedcasts.sh | 63 ++- themes/royal.sh | 63 ++- themes/sat.sh | 63 ++- themes/sea-shells.sh | 63 ++- themes/seafoam-pastel.sh | 63 ++- themes/seti.sh | 63 ++- themes/shaman.sh | 63 ++- themes/shel.sh | 63 ++- themes/slate.sh | 63 ++- themes/smyck.sh | 63 ++- themes/snazzy.sh | 63 ++- themes/soft-server.sh | 63 ++- themes/solarized-darcula.sh | 63 ++- themes/solarized-dark-higher-contrast.sh | 63 ++- themes/solarized-dark.sh | 63 ++- themes/solarized-light.sh | 63 ++- themes/spacedust.sh | 63 ++- themes/spacegray-eighties-dull.sh | 63 ++- themes/spacegray-eighties.sh | 63 ++- themes/spacegray.sh | 63 ++- themes/spring.sh | 63 ++- themes/square.sh | 63 ++- themes/srcery.sh | 63 ++- themes/sundried.sh | 63 ++- themes/symphonic.sh | 63 ++- themes/teerb.sh | 63 ++- themes/terminal-basic.sh | 63 ++- themes/terminix-dark.sh | 63 ++- themes/thayer-bright.sh | 63 ++- themes/tin.sh | 63 ++- themes/tomorrow-night-blue.sh | 63 ++- themes/tomorrow-night-bright.sh | 63 ++- themes/tomorrow-night-eighties.sh | 63 ++- themes/tomorrow-night.sh | 63 ++- themes/tomorrow.sh | 63 ++- themes/toy-chest.sh | 63 ++- themes/treehouse.sh | 63 ++- themes/twilight.sh | 63 ++- themes/ura.sh | 63 ++- themes/urple.sh | 63 ++- themes/vag.sh | 63 ++- themes/vaughn.sh | 63 ++- themes/vibrant-ink.sh | 63 ++- themes/warm-neon.sh | 63 ++- themes/wez.sh | 63 ++- themes/wild-cherry.sh | 63 ++- themes/wombat.sh | 63 ++- themes/wryan.sh | 63 ++- themes/zenburn.sh | 63 ++- 173 files changed, 5901 insertions(+), 6037 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index e3b6fa4..fdd130a 100644 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -10,6 +10,36 @@ GS="${GS:-$(command -v gsettings | xargs echo)}" # Note: xargs echo is to make the command sucessful even if it was not # otherwise the script will exit if the command does not exist (elementary os) + +# | +# | Second test for TERMINAL in case user ran +# | theme script directly instead of gogh.sh +# | ============================================ +if [[ -z "${TERMINAL:-}" ]]; then + + # | + # | Check for the terminal name (depening on os) + # | =========================================== + OS="$(uname)" + if [[ "$OS" = "Darwin" ]]; then + TERMINAL=$TERM_PROGRAM + elif [[ "${OS#CYGWIN}" != "${OS}" ]]; then + TERMINAL="mintty" + else + # | + # | Depending on how the script was invoked, we need + # | to loop until pid is no longer a subshell + # | =========================================== + pid="$$" + TERMINAL="$(ps -h -o comm -p $pid)" + while [[ "${TERMINAL:(-2)}" == "sh" ]]; do + pid="$(ps -h -o ppid -p $pid)" + TERMINAL="$(ps -h -o comm -p $pid)" + done + fi +fi + + case "${TERMINAL}" in pantheon-terminal|io.elementary.t* ) if [[ -z "${GS}" ]]; then @@ -38,7 +68,7 @@ case "${TERMINAL}" in printf '%s\n\n' "or export GCONF=/path/to/gconftool-2/" exit 1 fi - ;; + ;; esac if [[ -z "${DCONF}" ]]; then printf '\n%s\n' "Error dconf not found" @@ -77,7 +107,7 @@ hexRGBtoDecRGB () { convertRGBtoMac () { local color="${1}" - set - + set -- set -- $(hexRGBtoDecRGB "${color}") R=${1}; shift; G=${1}; shift; B=${1}; shift @@ -91,7 +121,7 @@ convertRGBtoMac () { createMinttyEntry () { local name="${1}" local color="${2}" - set - + set -- set -- $(hexRGBtoDecRGB "${color}") R=${1}; shift; G=${1}; shift; B=${1}; shift @@ -109,7 +139,7 @@ updateMinttyConfig () { convertNameAndRGBtoITerm() { local name="${1}" local color="${2}" - set - + set -- set -- $(convertRGBtoMac "${color}") R=${1}; shift; G=${1}; shift; B=${1}; shift @@ -128,12 +158,12 @@ dlist_append() { local key="${1}"; shift local val="${1}"; shift local entries - + entries="$( - { - "${DCONF}" read "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" - echo "'${val}'" - } | head -c-1 | tr "\n" , + { + "${DCONF}" read "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" + echo "'${val}'" + } | head -c-1 | tr "\n" , )" "${DCONF}" write "${key}" "[${entries}]" @@ -155,10 +185,10 @@ glist_append() { local entries entries="$( - { - "${GCONF}" --get "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" - echo "${val}" - } | head -c-1 | tr "\n" , + { + "${GCONF}" --get "${key}" | tr -d "[]" | tr , "\n" | grep -F -v "${val}" + echo "${val}" + } | head -c-1 | tr "\n" , )" "${GCONF}" --set --type list --list-type "${type}" "${key}" "[${entries}]" @@ -172,35 +202,35 @@ gset() { } set_theme() { - dset visible-name "'${PROFILE_NAME}'" - dset background-color "'${BACKGROUND_COLOR}'" - dset foreground-color "'${FOREGROUND_COLOR}'" + dset visible-name "'${PROFILE_NAME}'" + dset background-color "'${BACKGROUND_COLOR}'" + dset foreground-color "'${FOREGROUND_COLOR}'" - if [[ -n "${BOLD_COLOR:-}" ]]; then - dset bold-color "'${BOLD_COLOR}'" - dset bold-color-same-as-fg "false" - else - dset bold-color "'${FOREGROUND_COLOR}'" - dset bold-color-same-as-fg "true" - fi - dset use-theme-colors "false" - dset use-theme-background "false" + if [[ -n "${BOLD_COLOR:-}" ]]; then + dset bold-color "'${BOLD_COLOR}'" + dset bold-color-same-as-fg "false" + else + dset bold-color "'${FOREGROUND_COLOR}'" + dset bold-color-same-as-fg "true" + fi + dset use-theme-colors "false" + dset use-theme-background "false" } legacy_set_theme() { - gcset string visible_name "${PROFILE_NAME}" - gcset string background_color "${BACKGROUND_COLOR}" - gcset string foreground_color "${FOREGROUND_COLOR}" + gcset string visible_name "${PROFILE_NAME}" + gcset string background_color "${BACKGROUND_COLOR}" + gcset string foreground_color "${FOREGROUND_COLOR}" - if [[ -n "${BOLD_COLOR:-}" ]]; then - gcset string bold_color "${BOLD_COLOR}" - gcset bool bold_color_same_as_fg "false" - else - gcset string bold_color "${FOREGROUND_COLOR}" - gcset bool bold_color_same_as_fg "true" - fi - gcset bool use_theme_colors "false" - gcset bool use_theme_background "false" + if [[ -n "${BOLD_COLOR:-}" ]]; then + gcset string bold_color "${BOLD_COLOR}" + gcset bool bold_color_same_as_fg "false" + else + gcset string bold_color "${FOREGROUND_COLOR}" + gcset bool bold_color_same_as_fg "true" + fi + gcset bool use_theme_colors "false" + gcset bool use_theme_background "false" } @@ -209,30 +239,30 @@ legacy_set_theme() { # | If terminal supports truecolor then we can show theme colors without applying the theme # | =========================================== if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; then - # gogh_colors have been moved here to avoid multiple definitions - function gogh_colors () { - # Build up the color string to avoid visual rendering - local color_str - # Note: {01..16} does not work on OSX - for c in $(seq -s " " -w 16); do - local color="COLOR_$c" - set -- $(hexRGBtoDecRGB "${!color}") - color_str+="\033[38;2;${1};${2};${3}m█████$(tput sgr0)" - [[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && export "DEMO_COLOR_$c=\033[38;2;${1};${2};${3}m" - [[ "$c" == "08" ]] && color_str+="\n" # new line - done - printf '\n%b\n\n\n' "${color_str}" - } + # gogh_colors have been moved here to avoid multiple definitions + function gogh_colors () { + # Build up the color string to avoid visual rendering + local color_str + # Note: {01..16} does not work on OSX + for c in $(seq -s " " -w 16); do + local color="COLOR_$c" + set -- $(hexRGBtoDecRGB "${!color}") + color_str+="\033[38;2;${1};${2};${3}m█████$(tput sgr0)" + [[ ${GOGH_DRY_RUN:-0} -eq 1 ]] && export "DEMO_COLOR_$c=\033[38;2;${1};${2};${3}m" + [[ "$c" == "08" ]] && color_str+="\n" # new line + done + printf '\n%b\n\n\n' "${color_str}" + } else - function gogh_colors () { - # Build up the color string to avoid visual rendering - local color_str - for c in {0..15}; do - color_str+="$(tput setaf $c)█████$(tput sgr0)" - [[ $c == 7 ]] && color_str+="\n" # new line - done - printf '\n%b\n\n' "${color_str}" - } + function gogh_colors () { + # Build up the color string to avoid visual rendering + local color_str + for c in {0..15}; do + color_str+="$(tput setaf $c)█████$(tput sgr0)" + [[ $c == 7 ]] && color_str+="\n" # new line + done + printf '\n%b\n\n' "${color_str}" + } fi @@ -243,18 +273,18 @@ gogh_colors if [[ ${GOGH_DRY_RUN:-0} -eq 1 ]]; then color # End here if dry run was initiated - return 0 + exit 0 fi apply_elementary() { - # | - # | Applying values on elementary/pantheon terminal - # | =========================================== - gset background "${BACKGROUND_COLOR}" - gset foreground "${FOREGROUND_COLOR}" - gset cursor-color "${CURSOR_COLOR}" - gset palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" + # | + # | Applying values on elementary/pantheon terminal + # | =========================================== + gset background "${BACKGROUND_COLOR}" + gset foreground "${FOREGROUND_COLOR}" + gset cursor-color "${CURSOR_COLOR}" + gset palette "${COLOR_01}:${COLOR_02}:${COLOR_03}:${COLOR_04}:${COLOR_05}:${COLOR_06}:${COLOR_07}:${COLOR_08}:${COLOR_09}:${COLOR_10}:${COLOR_11}:${COLOR_12}:${COLOR_13}:${COLOR_14}:${COLOR_15}:${COLOR_16}" } apply_cygwin() { @@ -293,7 +323,7 @@ apply_darwin() { # | # | Applying values on iTerm2 # | =========================================== - + BACKGROUND_COLOR=$(convertNameAndRGBtoITerm "Background Color" "$BACKGROUND_COLOR") FOREGROUND_COLOR=$(convertNameAndRGBtoITerm "Foreground Color" "$FOREGROUND_COLOR") COLOR_01=$(convertNameAndRGBtoITerm "Ansi 0 Color" "$COLOR_01") @@ -341,10 +371,10 @@ apply_gtk() { # Check first wether profile already exists profile_hashes=($(${CONFTOOL} "${PROFILE_LIST_KEY}" | tr "[]'," " ")) for profile in "${profile_hashes[@]}"; do - if [[ "$(${CONFTOOL} "${BASE_DIR}${profile}/${VISIBLE_NAME}" | tr -d "'")" == "${PROFILE_NAME}" ]]; then - printf '%s\n' "Profile already exists" "Skipping..." - exit 0 - fi + if [[ "$(${CONFTOOL} "${BASE_DIR}${profile}/${VISIBLE_NAME}" | tr -d "'")" == "${PROFILE_NAME}" ]]; then + printf '%s\n' "Profile already exists" "Skipping..." + exit 0 + fi done # Fallback if there is no default profile @@ -360,11 +390,11 @@ apply_gtk() { if [[ -z "${legacy}" ]]; then if [[ -z "$(${DCONF} list ${BASE_DIR%:})" ]]; then # Provide a user friendly error text if no saved profile exists, otherwise it will display "Error gconftool not found!" - # it could happen on a newly installed system. (happened on CentOS 7) - printf '%s\n' \ - "Error, no saved profiles found!" \ - "Possible fix, new a profile (Terminal > Edit > Preferences > Profiles > New, then Close) and try again." \ - "You can safely delete the created profile after the installation." + # it could happen on a newly installed system. (happened on CentOS 7) + printf '%s\n' \ + "Error, no saved profiles found!" \ + "Possible fix, new a profile (Terminal > Edit > Preferences > Profiles > New, then Close) and try again." \ + "You can safely delete the created profile after the installation." exit 1 fi @@ -443,15 +473,15 @@ appy_tilixschemes() { # so we have to update color palette for the current profile in order to switch to the new theme # but only set the palette on the last loop to avoid a flashing terminal if ((LOOP == OPTLENGTH)); then - cp -f ${scratchdir}/* "$HOME/.config/tilix/schemes/" - rm -rf "${scratchdir}" - read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES - if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - PROFILE_KEY="${BASE_DIR}${DEFAULT_SLUG}" - PROFILE_NAME="$(${DCONF} read ${PROFILE_KEY}/visible-name | tr -d \')" - set_theme - dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" - fi + cp -f ${scratchdir}/* "$HOME/.config/tilix/schemes/" + rm -rf "${scratchdir}" + read -r -p "All done - apply new theme? [y/N] " -n 1 TILIX_RES + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + PROFILE_KEY="${BASE_DIR}${DEFAULT_SLUG}" + PROFILE_NAME="$(${DCONF} read ${PROFILE_KEY}/visible-name | tr -d \')" + set_theme + dset palette "['${COLOR_01}', '${COLOR_02}', '${COLOR_03}', '${COLOR_04}', '${COLOR_05}', '${COLOR_06}', '${COLOR_07}', '${COLOR_08}', '${COLOR_09}', '${COLOR_10}', '${COLOR_11}', '${COLOR_12}', '${COLOR_13}', '${COLOR_14}', '${COLOR_15}', '${COLOR_16}']" + fi fi unset PROFILE_NAME @@ -488,7 +518,7 @@ case "${TERMINAL}" in else apply_guake legacy fi - ;; + ;; gnome-terminal* ) if [[ -n "$(${DCONF} list /org/gnome/terminal/)" ]]; then @@ -515,7 +545,7 @@ case "${TERMINAL}" in apply_gtk legacy fi ;; - + mate-terminal ) BASE_DIR="/org/mate/terminal/profiles/" PROFILE_LIST_KEY="${BASE_DIR/profiles/global}profile-list" @@ -543,25 +573,25 @@ case "${TERMINAL}" in ;; * ) - printf '%s\n' \ - "Unsupported terminal!" \ - "" \ - "Supported terminals:" \ - " mintty and deriviates" \ - " guake" \ - " iTerm2" \ - " elementary terminal (pantheon/elementary)" \ - " mate-terminal" \ - " gnome-terminal" \ - " tilix" \ - "" \ - "If you believe you have recieved this message in error," \ - "try manually setting \`TERMINAL', hint: ps -h -o comm -p \$PPID" + printf '%s\n' \ + "Unsupported terminal!" \ + "" \ + "Supported terminals:" \ + " mintty and deriviates" \ + " guake" \ + " iTerm2" \ + " elementary terminal (pantheon/elementary)" \ + " mate-terminal" \ + " gnome-terminal" \ + " tilix" \ + "" \ + "If you believe you have recieved this message in error," \ + "try manually setting \`TERMINAL', hint: ps -h -o comm -p \$PPID" exit 1 ;; esac - + unset PROFILE_NAME unset PROFILE_SLUG unset DEFAULT_SLUG \ No newline at end of file diff --git a/gogh.sh b/gogh.sh index 0212fd4..693878d 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,224 +1,221 @@ #!/usr/bin/env bash declare -a THEMES=( - '3024-day.sh' - '3024-night.sh' - 'aci.sh' - 'aco.sh' - 'adventuretime.sh' - 'afterglow.sh' - 'alien-blood.sh' - 'argonaut.sh' - 'arthur.sh' - 'atom.sh' - 'azu.sh' - 'belafonte-day.sh' - 'belafonte-night.sh' - 'bim.sh' - 'birds-of-paradise.sh' - 'blazer.sh' - 'borland.sh' - 'broadcast.sh' - 'brogrammer.sh' - 'c64.sh' - 'cai.sh' - 'chalk.sh' - 'chalkboard.sh' - 'ciapre.sh' - 'clone-of-ubuntu.sh' - 'clrs.sh' - 'cobalt-neon.sh' - 'cobalt2.sh' - 'crayon-pony-fish.sh' - 'dark-pastel.sh' - 'darkside.sh' - 'desert.sh' - 'dimmed-monokai.sh' - 'dracula.sh' - 'earthsong.sh' - 'elemental.sh' - 'elementary.sh' - 'elic.sh' - 'elio.sh' - 'espresso-libre.sh' - 'espresso.sh' - 'fishtank.sh' - 'flat.sh' - 'flatland.sh' - 'foxnightly.sh' - 'freya.sh' - 'frontend-delight.sh' - 'frontend-fun-forrest.sh' - 'frontend-galaxy.sh' - 'github.sh' - 'google-dark.sh' - 'google-light.sh' - 'gooey.sh' - 'grape.sh' - 'grass.sh' - 'gruvbox-dark.sh' - 'gruvbox.sh' - 'hardcore.sh' - 'harper.sh' - 'hemisu-dark.sh' - 'hemisu-light.sh' - 'highway.sh' - 'hipster-green.sh' - 'homebrew.sh' - 'hurtado.sh' - 'hybrid.sh' - 'ic-green-ppl.sh' - 'ic-orange-ppl.sh' - 'idle-toes.sh' - 'ir-black.sh' - 'jackie-brown.sh' - 'japanesque.sh' - 'jellybeans.sh' - 'jup.sh' - 'kibble.sh' - 'later-this-evening.sh' - 'lavandula.sh' - 'liquid-carbon-transparent.sh' - 'liquid-carbon.sh' - 'man-page.sh' - 'mar.sh' - 'material.sh' - 'mathias.sh' - 'medallion.sh' - 'misterioso.sh' - 'miu.sh' - 'molokai.sh' - 'mona-lisa.sh' - 'monokai-dark.sh' - 'monokai-soda.sh' - 'n0tch2k.sh' - 'neopolitan.sh' - 'nep.sh' - 'neutron.sh' - 'nightlion-v1.sh' - 'nightlion-v2.sh' - 'nighty.sh' - 'nord-light.sh' - 'nord.sh' - 'novel.sh' - 'obsidian.sh' - 'ocean-dark.sh' - 'ocean.sh' - 'oceanic-next.sh' - 'ollie.sh' - 'one-dark.sh' - 'one-half-black.sh' - 'one-light.sh' - 'pali.sh' - 'paraiso-dark.sh' - 'paul-millr.sh' - 'pencil-dark.sh' - 'pencil-light.sh' - 'peppermint.sh' - 'pnevma.sh' - 'pro.sh' - 'red-alert.sh' - 'red-sands.sh' - 'rippedcasts.sh' - 'royal.sh' - 'sat.sh' - 'sea-shells.sh' - 'seafoam-pastel.sh' - 'seti.sh' - 'shaman.sh' - 'shel.sh' - 'slate.sh' - 'smyck.sh' - 'snazzy.sh' - 'soft-server.sh' - 'solarized-darcula.sh' - 'solarized-dark-higher-contrast.sh' - 'solarized-dark.sh' - 'solarized-light.sh' - 'spacedust.sh' - 'spacegray-eighties-dull.sh' - 'spacegray-eighties.sh' - 'spacegray.sh' - 'spring.sh' - 'square.sh' - 'srcery.sh' - 'sundried.sh' - 'symphonic.sh' - 'teerb.sh' - 'terminal-basic.sh' - 'terminix-dark.sh' - 'thayer-bright.sh' - 'tin.sh' - 'tomorrow-night-blue.sh' - 'tomorrow-night-bright.sh' - 'tomorrow-night-eighties.sh' - 'tomorrow-night.sh' - 'tomorrow.sh' - 'toy-chest.sh' - 'treehouse.sh' - 'twilight.sh' - 'ura.sh' - 'urple.sh' - 'vag.sh' - 'vaughn.sh' - 'vibrant-ink.sh' - 'warm-neon.sh' - 'wez.sh' - 'wild-cherry.sh' - 'wombat.sh' - 'wryan.sh' - 'zenburn.sh' -) + '3024-day.sh' + '3024-night.sh' + 'aci.sh' + 'aco.sh' + 'adventuretime.sh' + 'afterglow.sh' + 'alien-blood.sh' + 'argonaut.sh' + 'arthur.sh' + 'atom.sh' + 'azu.sh' + 'belafonte-day.sh' + 'belafonte-night.sh' + 'bim.sh' + 'birds-of-paradise.sh' + 'blazer.sh' + 'borland.sh' + 'broadcast.sh' + 'brogrammer.sh' + 'c64.sh' + 'cai.sh' + 'chalk.sh' + 'chalkboard.sh' + 'ciapre.sh' + 'clone-of-ubuntu.sh' + 'clrs.sh' + 'cobalt-neon.sh' + 'cobalt2.sh' + 'crayon-pony-fish.sh' + 'dark-pastel.sh' + 'darkside.sh' + 'desert.sh' + 'dimmed-monokai.sh' + 'dracula.sh' + 'earthsong.sh' + 'elemental.sh' + 'elementary.sh' + 'elic.sh' + 'elio.sh' + 'espresso-libre.sh' + 'espresso.sh' + 'fishtank.sh' + 'flat.sh' + 'flatland.sh' + 'foxnightly.sh' + 'freya.sh' + 'frontend-delight.sh' + 'frontend-fun-forrest.sh' + 'frontend-galaxy.sh' + 'github.sh' + 'google-dark.sh' + 'google-light.sh' + 'gooey.sh' + 'grape.sh' + 'grass.sh' + 'gruvbox-dark.sh' + 'gruvbox.sh' + 'hardcore.sh' + 'harper.sh' + 'hemisu-dark.sh' + 'hemisu-light.sh' + 'highway.sh' + 'hipster-green.sh' + 'homebrew.sh' + 'hurtado.sh' + 'hybrid.sh' + 'ic-green-ppl.sh' + 'ic-orange-ppl.sh' + 'idle-toes.sh' + 'ir-black.sh' + 'jackie-brown.sh' + 'japanesque.sh' + 'jellybeans.sh' + 'jup.sh' + 'kibble.sh' + 'later-this-evening.sh' + 'lavandula.sh' + 'liquid-carbon-transparent.sh' + 'liquid-carbon.sh' + 'man-page.sh' + 'mar.sh' + 'material.sh' + 'mathias.sh' + 'medallion.sh' + 'misterioso.sh' + 'miu.sh' + 'molokai.sh' + 'mona-lisa.sh' + 'monokai-dark.sh' + 'monokai-soda.sh' + 'n0tch2k.sh' + 'neopolitan.sh' + 'nep.sh' + 'neutron.sh' + 'nightlion-v1.sh' + 'nightlion-v2.sh' + 'nighty.sh' + 'nord-light.sh' + 'nord.sh' + 'novel.sh' + 'obsidian.sh' + 'ocean-dark.sh' + 'ocean.sh' + 'oceanic-next.sh' + 'ollie.sh' + 'one-dark.sh' + 'one-half-black.sh' + 'one-light.sh' + 'pali.sh' + 'paraiso-dark.sh' + 'paul-millr.sh' + 'pencil-dark.sh' + 'pencil-light.sh' + 'peppermint.sh' + 'pnevma.sh' + 'pro.sh' + 'red-alert.sh' + 'red-sands.sh' + 'rippedcasts.sh' + 'royal.sh' + 'sat.sh' + 'sea-shells.sh' + 'seafoam-pastel.sh' + 'seti.sh' + 'shaman.sh' + 'shel.sh' + 'slate.sh' + 'smyck.sh' + 'snazzy.sh' + 'soft-server.sh' + 'solarized-darcula.sh' + 'solarized-dark-higher-contrast.sh' + 'solarized-dark.sh' + 'solarized-light.sh' + 'spacedust.sh' + 'spacegray-eighties-dull.sh' + 'spacegray-eighties.sh' + 'spacegray.sh' + 'spring.sh' + 'square.sh' + 'srcery.sh' + 'sundried.sh' + 'symphonic.sh' + 'teerb.sh' + 'terminal-basic.sh' + 'terminix-dark.sh' + 'thayer-bright.sh' + 'tin.sh' + 'tomorrow-night-blue.sh' + 'tomorrow-night-bright.sh' + 'tomorrow-night-eighties.sh' + 'tomorrow-night.sh' + 'tomorrow.sh' + 'toy-chest.sh' + 'treehouse.sh' + 'twilight.sh' + 'ura.sh' + 'urple.sh' + 'vag.sh' + 'vaughn.sh' + 'vibrant-ink.sh' + 'warm-neon.sh' + 'wez.sh' + 'wild-cherry.sh' + 'wombat.sh' + 'wryan.sh' + 'zenburn.sh' + ) # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} capitalize() { - local ARGUMENT=$1 - local RES="" - local STR="" - local RES_NO_TRAIL_SPACE="" + local ARGUMENT=$1 + local RES="" + local STR="" + local RES_NO_TRAIL_SPACE="" - for CHAR in $ARGUMENT - do - STR=$(echo "${CHAR:0:1}" | tr "[:lower:]" "[:upper:]")"${CHAR:1} " - RES="${RES}${STR}" - RES_NO_TRAIL_SPACE="$(echo -e "${RES}" | sed -e 's/[[:space:]]*$//')" - done + for CHAR in $ARGUMENT; do + STR=$(echo "${CHAR:0:1}" | tr "[:lower:]" "[:upper:]")"${CHAR:1} " + RES="${RES}${STR}" + RES_NO_TRAIL_SPACE="$(echo -e "${RES}" | sed -e 's/[[:space:]]*$//')" + done - echo "${RES_NO_TRAIL_SPACE}" + echo "${RES_NO_TRAIL_SPACE}" } set_gogh() { - string=$1 - string_r="${string%???}" - string_s=${string_r//\./_} - result=$(capitalize "${string_s}") - url="${BASE_URL}/themes/$1" + string=$1 + string_r="${string%???}" + string_s=${string_r//\./_} + result=$(capitalize "${string_s}") + url="${BASE_URL}/themes/$1" - export {PROFILE_NAME,PROFILE_SLUG}="$result" + export {PROFILE_NAME,PROFILE_SLUG}="$result" - # Evaluate if Gogh was called from local source - i.e cloned repo - SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - # This is to handle dirs with spaces in their names - printf -v SCRIPT_PATH "'%s'" "${SCRIPT_PATH}" - if [[ -e "${SCRIPT_PATH}/themes/$1" ]]; then - (eval "${SCRIPT_PATH}/themes/$1") + # Evaluate if Gogh was called from local source - i.e cloned repo + SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [[ -e "${SCRIPT_PATH}/themes/$1" ]]; then + bash "${SCRIPT_PATH}/themes/$1" + else + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl + (eval "$(curl -sLo- "${url}")") else - if [[ "$(uname)" = "Darwin" ]]; then - # OSX ships with curl - (eval "$(curl -sLo- "${url}")") - else - # Linux ships with wget - (eval "$(wget -qO- "${url}")") - fi + # Linux ships with wget + (eval "$(wget -qO- "${url}")") fi + fi } remove_file_extension (){ - echo "${1%.*}" + echo "${1%.*}" } @@ -251,7 +248,7 @@ if [[ ${COLUMNS:-$(tput cols)} -ge 80 ]]; then printf '%b\n' "${gogh_str}" - sleep 2.5 + #sleep 2.5 else echo -e "\nGogh\n" for c in {0..15}; do @@ -269,16 +266,16 @@ echo -e "\nThemes:\n" for TH in "${THEMES[@]}"; do - KEY=$(printf "%02d" $NUM) - FILENAME=${TH::$((${#TH}-3))} - FILENAME_SPACE=${FILENAME//-/ } + KEY=$(printf "%02d" $NUM) + FILENAME=${TH::$((${#TH}-3))} + FILENAME_SPACE=${FILENAME//-/ } - echo -e " ($(tput setaf 4) $KEY $(tput sgr0)) $(capitalize "${FILENAME_SPACE}")" + echo -e " ($(tput setaf 4) $KEY $(tput sgr0)) $(capitalize "${FILENAME_SPACE}")" - ((NUM++)) + ((NUM++)) done - echo -e " ($(tput setaf 4) ALL $(tput sgr0)) All themes" +echo -e " ($(tput setaf 4) ALL $(tput sgr0)) All themes" # | # | ::::::: Select Option @@ -299,20 +296,20 @@ if [[ -z "${TERMINAL:-}" ]]; then # | =========================================== OS="$(uname)" if [[ "$OS" = "Darwin" ]]; then - TERMINAL=$TERM_PROGRAM + TERMINAL=$TERM_PROGRAM elif [[ "${OS#CYGWIN}" != "${OS}" ]]; then - TERMINAL="mintty" + TERMINAL="mintty" else - # | - # | Depending on how the script was invoked, we need - # | to loop until pid is no longer a subshell - # | =========================================== - pid="$$" + # | + # | Depending on how the script was invoked, we need + # | to loop until pid is no longer a subshell + # | =========================================== + pid="$$" + TERMINAL="$(ps -h -o comm -p $pid)" + while [[ "${TERMINAL:(-2)}" == "sh" ]]; do + pid="$(ps -h -o ppid -p $pid)" TERMINAL="$(ps -h -o comm -p $pid)" - while [[ "${TERMINAL:(-2)}" == "sh" ]]; do - pid="$(ps -h -o ppid -p $pid)" - TERMINAL="$(ps -h -o comm -p $pid)" - done + done fi fi @@ -321,11 +318,11 @@ fi # | ::::::: Fancy progressbar for lengthy operations # | if [[ ${#OPTION[@]} -gt 5 ]]; then - if [ "$(uname)" = "Darwin" ]; then - eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null - else - eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null - fi + if [[ "$(uname)" = "Darwin" ]]; then + eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null + else + eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null + fi fi @@ -334,29 +331,29 @@ fi # | This is to avoid creating multiple profiles just for colors # | =========================================== if [[ "$TERMINAL" = "tilix" ]] && [[ ${#OPTION[@]} -gt 0 ]]; then - echo - read -r -p "Tilix detected - use color schemes instead of profiles? [y/N] " -n 1 TILIX_RES - echo - - # | - # | When selecting multiple themes and user opts for color schemes, we save all themes - # | in a tmpdir and copy the files once all themes has been processed.. If a user - # | desides to abort before all themes has been processed this section will cleanup the tmpdir - # | ======================================= - if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - cleanup() { - echo - echo "Cleaning up" - rm -rf "$scratchdir" - unset LOOP OPTLENGTH - echo "Done..." - exit 0 - } + echo + read -r -p "Tilix detected - use color schemes instead of profiles? [y/N] " -n 1 TILIX_RES + echo + + # | + # | When selecting multiple themes and user opts for color schemes, we save all themes + # | in a tmpdir and copy the files once all themes has been processed.. If a user + # | desides to abort before all themes has been processed this section will cleanup the tmpdir + # | ======================================= + if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then + cleanup() { + echo + echo "Cleaning up" + rm -rf "$scratchdir" + unset LOOP OPTLENGTH + echo "Done..." + exit 0 + } - scratchdir=$(mktemp -d -t tmp.XXXXXXXX) - export scratchdir - trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM - fi + scratchdir=$(mktemp -d -t tmp.XXXXXXXX) + export scratchdir + trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM + fi fi @@ -371,33 +368,36 @@ export TERMINAL LOOP OPTLENGTH=${#OPTION[@]} # | ::::::: Apply Theme # | - # Note: - # Constants with a leading 0 are interpreted as octal numbers - # Hence option 08 and 09 will not work - # Solution is to remove the leading 0 from the parsed options +declare color_dot_str +for c in {0..15}; do + color_dot_str+="$(tput setaf $c)•$(tput sgr0)" + [[ $c == 7 ]] && color_dot_str+=" " +done + +# Note: +# Constants with a leading 0 are interpreted as octal numbers +# Hence option 08 and 09 will not work +# Solution is to remove the leading 0 from the parsed options command -v bar::start > /dev/null && bar::start for OP in "${OPTION[@]#0}"; do - # See Tilix section in apply-colors.sh for usage of LOOP - LOOP=$((${LOOP:-0}+1)) + # See appy_tilixschemes in apply-colors.sh for usage of LOOP + LOOP=$((${LOOP:-0}+1)) - command -v bar::status_changed > /dev/null && bar::status_changed $LOOP ${#OPTION[@]} + command -v bar::status_changed > /dev/null && bar::status_changed $LOOP ${#OPTION[@]} - if [[ OP -le ARRAYLENGTH && OP -gt 0 ]]; then + if [[ OP -le ARRAYLENGTH && OP -gt 0 ]]; then - FILENAME=$(remove_file_extension "${THEMES[((OP-1))]}") - FILENAME_SPACE="${FILENAME//-/ }" - echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")" - for c in {0..15}; do - echo -n "$(tput setaf $c)•$(tput sgr0)" - [[ $c == 7 ]] && echo -n " " - done - echo + FILENAME=$(remove_file_extension "${THEMES[((OP-1))]}") + FILENAME_SPACE="${FILENAME//-/ }" + echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")" + echo "${color_dot_str}" + echo - SET_THEME="${THEMES[((OP-1))]}" - set_gogh "${SET_THEME}" - else - echo -e "$(tput setaf 1) ~ INVALID OPTION! ~$(tput sgr0)" - exit 1 - fi + SET_THEME="${THEMES[((OP-1))]}" + set_gogh "${SET_THEME}" + else + echo -e "$(tput setaf 1) ~ INVALID OPTION! ~$(tput sgr0)" + exit 1 + fi done -command -v bar::stop > /dev/null && bar::stop \ No newline at end of file +command -v bar::stop > /dev/null && bar::stop || : \ No newline at end of file diff --git a/test/print-themes.sh b/test/print-themes.sh index ceeb1af..4f57efd 100755 --- a/test/print-themes.sh +++ b/test/print-themes.sh @@ -7,269 +7,274 @@ if [[ "${COLORTERM:-}" != "truecolor" ]] && [[ "${COLORTERM:-}" != "24bit" ]]; t fi # Reset color -RS="$(tput sgr0)" +export RS="$(tput sgr0)" # Print all themes without applying, this variable gets checked in apply-colors.sh export GOGH_DRY_RUN=1 color () { - # echo "" - #black - echo -e "${DEMO_COLOR_01} ███ *** AaBbCs --- ███ ${RS} ---> Color 01 'tput setaf 0'" - #red - echo -e "${DEMO_COLOR_02} ███ *** AaBbCs --- ███ ${RS} ---> Color 02 'tput setaf 1'" - #green - echo -e "${DEMO_COLOR_03} ███ *** AaBbCs --- ███ ${RS} ---> Color 03 'tput setaf 2'" - #yellow - echo -e "${DEMO_COLOR_04} ███ *** AaBbCs --- ███ ${RS} ---> Color 04 'tput setaf 3'" - #blue - echo -e "${DEMO_COLOR_05} ███ *** AaBbCs --- ███ ${RS} ---> Color 05 'tput setaf 4'" - #purple - echo -e "${DEMO_COLOR_06} ███ *** AaBbCs --- ███ ${RS} ---> Color 06 'tput setaf 5'" - #cyan - echo -e "${DEMO_COLOR_07} ███ *** AaBbCs --- ███ ${RS} ---> Color 07 'tput setaf 6'" - #white - echo -e "${DEMO_COLOR_08} ███ *** AaBbCs --- ███ ${RS} ---> Color 08 'tput setaf 7'" - echo "" - #black - echo -e "${DEMO_COLOR_09} ███ *** AaBbCs --- ███ ${RS} ---> Color 09 'tput setaf 8'" - #red - echo -e "${DEMO_COLOR_10} ███ *** AaBbCs --- ███ ${RS} ---> Color 10 'tput setaf 9'" - #green - echo -e "${DEMO_COLOR_11} ███ *** AaBbCs --- ███ ${RS} ---> Color 11 'tput setaf 10'" - #yellow - echo -e "${DEMO_COLOR_12} ███ *** AaBbCs --- ███ ${RS} ---> Color 12 'tput setaf 11'" - #blue - echo -e "${DEMO_COLOR_13} ███ *** AaBbCs --- ███ ${RS} ---> Color 13 'tput setaf 12'" - #purple - echo -e "${DEMO_COLOR_14} ███ *** AaBbCs --- ███ ${RS} ---> Color 14 'tput setaf 13'" - #cyan - echo -e "${DEMO_COLOR_15} ███ *** AaBbCs --- ███ ${RS} ---> Color 15 'tput setaf 14'" - #white - echo -e "${DEMO_COLOR_16} ███ *** AaBbCs --- ███ ${RS} ---> Color 16 'tput setaf 15'" - echo "" + # echo "" + #black + echo -e "${DEMO_COLOR_01} ███ *** AaBbCs --- ███ ${RS} ---> Color 01 'tput setaf 0'" + #red + echo -e "${DEMO_COLOR_02} ███ *** AaBbCs --- ███ ${RS} ---> Color 02 'tput setaf 1'" + #green + echo -e "${DEMO_COLOR_03} ███ *** AaBbCs --- ███ ${RS} ---> Color 03 'tput setaf 2'" + #yellow + echo -e "${DEMO_COLOR_04} ███ *** AaBbCs --- ███ ${RS} ---> Color 04 'tput setaf 3'" + #blue + echo -e "${DEMO_COLOR_05} ███ *** AaBbCs --- ███ ${RS} ---> Color 05 'tput setaf 4'" + #purple + echo -e "${DEMO_COLOR_06} ███ *** AaBbCs --- ███ ${RS} ---> Color 06 'tput setaf 5'" + #cyan + echo -e "${DEMO_COLOR_07} ███ *** AaBbCs --- ███ ${RS} ---> Color 07 'tput setaf 6'" + #white + echo -e "${DEMO_COLOR_08} ███ *** AaBbCs --- ███ ${RS} ---> Color 08 'tput setaf 7'" + echo "" + #black + echo -e "${DEMO_COLOR_09} ███ *** AaBbCs --- ███ ${RS} ---> Color 09 'tput setaf 8'" + #red + echo -e "${DEMO_COLOR_10} ███ *** AaBbCs --- ███ ${RS} ---> Color 10 'tput setaf 9'" + #green + echo -e "${DEMO_COLOR_11} ███ *** AaBbCs --- ███ ${RS} ---> Color 11 'tput setaf 10'" + #yellow + echo -e "${DEMO_COLOR_12} ███ *** AaBbCs --- ███ ${RS} ---> Color 12 'tput setaf 11'" + #blue + echo -e "${DEMO_COLOR_13} ███ *** AaBbCs --- ███ ${RS} ---> Color 13 'tput setaf 12'" + #purple + echo -e "${DEMO_COLOR_14} ███ *** AaBbCs --- ███ ${RS} ---> Color 14 'tput setaf 13'" + #cyan + echo -e "${DEMO_COLOR_15} ███ *** AaBbCs --- ███ ${RS} ---> Color 15 'tput setaf 14'" + #white + echo -e "${DEMO_COLOR_16} ███ *** AaBbCs --- ███ ${RS} ---> Color 16 'tput setaf 15'" + echo "" } export -f color declare -a THEMES=( - '3024-day.sh' - '3024-night.sh' - 'aci.sh' - 'aco.sh' - 'adventuretime.sh' - 'afterglow.sh' - 'alien-blood.sh' - 'argonaut.sh' - 'arthur.sh' - 'atom.sh' - 'azu.sh' - 'belafonte-day.sh' - 'belafonte-night.sh' - 'bim.sh' - 'birds-of-paradise.sh' - 'blazer.sh' - 'borland.sh' - 'broadcast.sh' - 'brogrammer.sh' - 'c64.sh' - 'cai.sh' - 'chalk.sh' - 'chalkboard.sh' - 'ciapre.sh' - 'clone-of-ubuntu.sh' - 'clrs.sh' - 'cobalt-neon.sh' - 'cobalt2.sh' - 'crayon-pony-fish.sh' - 'dark-pastel.sh' - 'darkside.sh' - 'desert.sh' - 'dimmed-monokai.sh' - 'dracula.sh' - 'earthsong.sh' - 'elemental.sh' - 'elementary.sh' - 'elic.sh' - 'elio.sh' - 'espresso-libre.sh' - 'espresso.sh' - 'fishtank.sh' - 'flat.sh' - 'flatland.sh' - 'foxnightly.sh' - 'freya.sh' - 'frontend-delight.sh' - 'frontend-fun-forrest.sh' - 'frontend-galaxy.sh' - 'github.sh' - 'google-dark.sh' - 'google-light.sh' - 'gooey.sh' - 'grape.sh' - 'grass.sh' - 'gruvbox-dark.sh' - 'gruvbox.sh' - 'hardcore.sh' - 'harper.sh' - 'hemisu-dark.sh' - 'hemisu-light.sh' - 'highway.sh' - 'hipster-green.sh' - 'homebrew.sh' - 'hurtado.sh' - 'hybrid.sh' - 'ic-green-ppl.sh' - 'ic-orange-ppl.sh' - 'idle-toes.sh' - 'ir-black.sh' - 'jackie-brown.sh' - 'japanesque.sh' - 'jellybeans.sh' - 'jup.sh' - 'kibble.sh' - 'later-this-evening.sh' - 'lavandula.sh' - 'liquid-carbon-transparent.sh' - 'liquid-carbon.sh' - 'man-page.sh' - 'mar.sh' - 'material.sh' - 'mathias.sh' - 'medallion.sh' - 'misterioso.sh' - 'miu.sh' - 'molokai.sh' - 'mona-lisa.sh' - 'monokai-dark.sh' - 'monokai-soda.sh' - 'n0tch2k.sh' - 'neopolitan.sh' - 'nep.sh' - 'neutron.sh' - 'nightlion-v1.sh' - 'nightlion-v2.sh' - 'nighty.sh' - 'nord-light.sh' - 'nord.sh' - 'novel.sh' - 'obsidian.sh' - 'ocean-dark.sh' - 'ocean.sh' - 'oceanic-next.sh' - 'ollie.sh' - 'one-dark.sh' - 'one-half-black.sh' - 'one-light.sh' - 'pali.sh' - 'paraiso-dark.sh' - 'paul-millr.sh' - 'pencil-dark.sh' - 'pencil-light.sh' - 'peppermint.sh' - 'pnevma.sh' - 'pro.sh' - 'red-alert.sh' - 'red-sands.sh' - 'rippedcasts.sh' - 'royal.sh' - 'sat.sh' - 'sea-shells.sh' - 'seafoam-pastel.sh' - 'seti.sh' - 'shaman.sh' - 'shel.sh' - 'slate.sh' - 'smyck.sh' - 'snazzy.sh' - 'soft-server.sh' - 'solarized-darcula.sh' - 'solarized-dark-higher-contrast.sh' - 'solarized-dark.sh' - 'solarized-light.sh' - 'spacedust.sh' - 'spacegray-eighties-dull.sh' - 'spacegray-eighties.sh' - 'spacegray.sh' - 'spring.sh' - 'square.sh' - 'srcery.sh' - 'sundried.sh' - 'symphonic.sh' - 'teerb.sh' - 'terminal-basic.sh' - 'terminix-dark.sh' - 'thayer-bright.sh' - 'tin.sh' - 'tomorrow-night-blue.sh' - 'tomorrow-night-bright.sh' - 'tomorrow-night-eighties.sh' - 'tomorrow-night.sh' - 'tomorrow.sh' - 'toy-chest.sh' - 'treehouse.sh' - 'twilight.sh' - 'ura.sh' - 'urple.sh' - 'vag.sh' - 'vaughn.sh' - 'vibrant-ink.sh' - 'warm-neon.sh' - 'wez.sh' - 'wild-cherry.sh' - 'wombat.sh' - 'wryan.sh' - 'zenburn.sh' -) + '3024-day.sh' + '3024-night.sh' + 'aci.sh' + 'aco.sh' + 'adventuretime.sh' + 'afterglow.sh' + 'alien-blood.sh' + 'argonaut.sh' + 'arthur.sh' + 'atom.sh' + 'azu.sh' + 'belafonte-day.sh' + 'belafonte-night.sh' + 'bim.sh' + 'birds-of-paradise.sh' + 'blazer.sh' + 'borland.sh' + 'broadcast.sh' + 'brogrammer.sh' + 'c64.sh' + 'cai.sh' + 'chalk.sh' + 'chalkboard.sh' + 'ciapre.sh' + 'clone-of-ubuntu.sh' + 'clrs.sh' + 'cobalt-neon.sh' + 'cobalt2.sh' + 'crayon-pony-fish.sh' + 'dark-pastel.sh' + 'darkside.sh' + 'desert.sh' + 'dimmed-monokai.sh' + 'dracula.sh' + 'earthsong.sh' + 'elemental.sh' + 'elementary.sh' + 'elic.sh' + 'elio.sh' + 'espresso-libre.sh' + 'espresso.sh' + 'fishtank.sh' + 'flat.sh' + 'flatland.sh' + 'foxnightly.sh' + 'freya.sh' + 'frontend-delight.sh' + 'frontend-fun-forrest.sh' + 'frontend-galaxy.sh' + 'github.sh' + 'google-dark.sh' + 'google-light.sh' + 'gooey.sh' + 'grape.sh' + 'grass.sh' + 'gruvbox-dark.sh' + 'gruvbox.sh' + 'hardcore.sh' + 'harper.sh' + 'hemisu-dark.sh' + 'hemisu-light.sh' + 'highway.sh' + 'hipster-green.sh' + 'homebrew.sh' + 'hurtado.sh' + 'hybrid.sh' + 'ic-green-ppl.sh' + 'ic-orange-ppl.sh' + 'idle-toes.sh' + 'ir-black.sh' + 'jackie-brown.sh' + 'japanesque.sh' + 'jellybeans.sh' + 'jup.sh' + 'kibble.sh' + 'later-this-evening.sh' + 'lavandula.sh' + 'liquid-carbon-transparent.sh' + 'liquid-carbon.sh' + 'man-page.sh' + 'mar.sh' + 'material.sh' + 'mathias.sh' + 'medallion.sh' + 'misterioso.sh' + 'miu.sh' + 'molokai.sh' + 'mona-lisa.sh' + 'monokai-dark.sh' + 'monokai-soda.sh' + 'n0tch2k.sh' + 'neopolitan.sh' + 'nep.sh' + 'neutron.sh' + 'nightlion-v1.sh' + 'nightlion-v2.sh' + 'nighty.sh' + 'nord-light.sh' + 'nord.sh' + 'novel.sh' + 'obsidian.sh' + 'ocean-dark.sh' + 'ocean.sh' + 'oceanic-next.sh' + 'ollie.sh' + 'one-dark.sh' + 'one-half-black.sh' + 'one-light.sh' + 'pali.sh' + 'paraiso-dark.sh' + 'paul-millr.sh' + 'pencil-dark.sh' + 'pencil-light.sh' + 'peppermint.sh' + 'pnevma.sh' + 'pro.sh' + 'red-alert.sh' + 'red-sands.sh' + 'rippedcasts.sh' + 'royal.sh' + 'sat.sh' + 'sea-shells.sh' + 'seafoam-pastel.sh' + 'seti.sh' + 'shaman.sh' + 'shel.sh' + 'slate.sh' + 'smyck.sh' + 'snazzy.sh' + 'soft-server.sh' + 'solarized-darcula.sh' + 'solarized-dark-higher-contrast.sh' + 'solarized-dark.sh' + 'solarized-light.sh' + 'spacedust.sh' + 'spacegray-eighties-dull.sh' + 'spacegray-eighties.sh' + 'spacegray.sh' + 'spring.sh' + 'square.sh' + 'srcery.sh' + 'sundried.sh' + 'symphonic.sh' + 'teerb.sh' + 'terminal-basic.sh' + 'terminix-dark.sh' + 'thayer-bright.sh' + 'tin.sh' + 'tomorrow-night-blue.sh' + 'tomorrow-night-bright.sh' + 'tomorrow-night-eighties.sh' + 'tomorrow-night.sh' + 'tomorrow.sh' + 'toy-chest.sh' + 'treehouse.sh' + 'twilight.sh' + 'ura.sh' + 'urple.sh' + 'vag.sh' + 'vaughn.sh' + 'vibrant-ink.sh' + 'warm-neon.sh' + 'wez.sh' + 'wild-cherry.sh' + 'wombat.sh' + 'wryan.sh' + 'zenburn.sh' + ) # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} capitalize() { - local ARGUMENT=$1 - local RES="" - local STR="" - local RES_NO_TRAIL_SPACE="" + local ARGUMENT=$1 + local RES="" + local STR="" + local RES_NO_TRAIL_SPACE="" - for CHAR in $ARGUMENT - do - STR=$(echo "${CHAR:0:1}" | tr "[:lower:]" "[:upper:]")"${CHAR:1} " - RES="${RES}${STR}" - RES_NO_TRAIL_SPACE="$(echo -e "${RES}" | sed -e 's/[[:space:]]*$//')" - done + for CHAR in $ARGUMENT + do + STR=$(echo "${CHAR:0:1}" | tr "[:lower:]" "[:upper:]")"${CHAR:1} " + RES="${RES}${STR}" + RES_NO_TRAIL_SPACE="$(echo -e "${RES}" | sed -e 's/[[:space:]]*$//')" + done - echo "${RES_NO_TRAIL_SPACE}" + echo "${RES_NO_TRAIL_SPACE}" } set_gogh() { - url="https://raw.githubusercontent.com/Mayccoll/Gogh/master/themes/$1" + url="${BASE_URL}/themes/$1" - # Evaluate if Gogh was called from local source - i.e cloned repo - SCRIPT_PATH="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")" - if [[ -e "${SCRIPT_PATH}/themes/$1" ]]; then - eval "$(<"${SCRIPT_PATH}/themes/$1")" + # Evaluate if Gogh was called from local source - i.e cloned repo + SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + PARENT_PATH="$(dirname "${SCRIPT_PATH}")" + if [[ -e "${PARENT_PATH}/themes/$1" ]]; then + bash "${PARENT_PATH}/themes/$1" + else + if [[ "$(uname)" = "Darwin" ]]; then + (eval "$(curl -so- "${url}")") else - if [[ "$(uname)" = "Darwin" ]]; then - # OSX ships with curl - (eval "$(curl -so- "${url}")") - else - (eval "$(wget -qO- "${url}")") - fi + (eval "$(wget -qO- "${url}")") fi + fi } remove_file_extension (){ - echo "${1%.*}" + echo "${1%.*}" } # Fancy progress bar -if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl - eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null +if [[ "$(uname)" = "Darwin" ]]; then + eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null else - eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null + eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null fi +declare color_dot_str +for c in {0..15}; do + color_dot_str+="$(tput setaf $c)•$(tput sgr0)" + [[ $c == 7 ]] && color_dot_str+=" " +done + command -v bar::start > /dev/null && bar::start for THEME in "${THEMES[@]}"; do @@ -279,17 +284,14 @@ for THEME in "${THEMES[@]}"; do FILENAME=$(remove_file_extension "${THEME}") FILENAME_SPACE="${FILENAME//-/ }" echo -e "\nTheme: $(capitalize "${FILENAME_SPACE}")" - for c in {0..15}; do - echo -n "$(tput setaf $c)•$(tput sgr0)" - [[ $c == 7 ]] && echo -n " " - done + echo "${color_dot_str}" echo set_gogh "${THEME}" done LOOP=$((${LOOP:-(-1)}+1)) -command -v bar::stop > /dev/null && bar::status_changed $LOOP ${#THEMES[@]} +command -v bar::status_changed > /dev/null && bar::status_changed $LOOP ${#THEMES[@]} -command -v bar::stop > /dev/null && bar::stop +command -v bar::stop > /dev/null && bar::stop || : unset GOGH_DRY_RUN \ No newline at end of file diff --git a/test/test.sh b/test/test.sh index b78107c..b8db4eb 100644 --- a/test/test.sh +++ b/test/test.sh @@ -15,57 +15,57 @@ WHITE="\e[0;37m" function_message_title () { - echo "" - echo "" - echo "" - echo "" - echo "" - echo -e "${CYAN}" - echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" - echo -e "# | ${RS} $1 ${CYAN}" - echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" - echo -e "${RS}" + echo "" + echo "" + echo "" + echo "" + echo "" + echo -e "${CYAN}" + echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" + echo -e "# | ${RS} $1 ${CYAN}" + echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" + echo -e "${RS}" } color () { - # echo "" - #black - echo -e "\e[0;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 01 0;30m" - #red - echo -e "\e[0;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 02 0;31m" - #green - echo -e "\e[0;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 03 0;32m" - #yellow - echo -e "\e[0;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 04 0;33m" - #blue - echo -e "\e[0;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 05 0;34m" - #purple - echo -e "\e[0;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 06 0;35m" - #cyan - echo -e "\e[0;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 07 0;36m" - #white - echo -e "\e[0;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 08 0;37m" - echo "" - #black - echo -e "\e[1;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 09 1;30m" - #red - echo -e "\e[1;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 10 1;31m" - #green - echo -e "\e[1;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 11 1;32m" - #yellow - echo -e "\e[1;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 12 1;33m" - #blue - echo -e "\e[1;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 13 1;34m" - #purple - echo -e "\e[1;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 14 1;35m" - #cyan - echo -e "\e[1;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 15 1;36m" - #white - echo -e "\e[1;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 16 1;37m" - echo "" - echo -e "\e[0;30m█████\\e[0m\e[0;31m█████\\e[0m\e[0;32m█████\\e[0m\e[0;33m█████\\e[0m\e[0;34m█████\\e[0m\e[0;35m█████\\e[0m\e[0;36m█████\\e[0m\e[0;37m█████\\e[0m" - echo -e "\e[0m\e[1;30m█████\\e[0m\e[1;31m█████\\e[0m\e[1;32m█████\\e[0m\e[1;33m█████\\e[0m\e[1;34m█████\\e[0m\e[1;35m█████\\e[0m\e[1;36m█████\\e[0m\e[1;37m█████\\e[0m" + # echo "" + #black + echo -e "\e[0;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 01 0;30m" + #red + echo -e "\e[0;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 02 0;31m" + #green + echo -e "\e[0;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 03 0;32m" + #yellow + echo -e "\e[0;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 04 0;33m" + #blue + echo -e "\e[0;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 05 0;34m" + #purple + echo -e "\e[0;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 06 0;35m" + #cyan + echo -e "\e[0;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 07 0;36m" + #white + echo -e "\e[0;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 08 0;37m" + echo "" + #black + echo -e "\e[1;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 09 1;30m" + #red + echo -e "\e[1;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 10 1;31m" + #green + echo -e "\e[1;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 11 1;32m" + #yellow + echo -e "\e[1;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 12 1;33m" + #blue + echo -e "\e[1;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 13 1;34m" + #purple + echo -e "\e[1;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 14 1;35m" + #cyan + echo -e "\e[1;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 15 1;36m" + #white + echo -e "\e[1;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 16 1;37m" + echo "" + echo -e "\e[0;30m█████\\e[0m\e[0;31m█████\\e[0m\e[0;32m█████\\e[0m\e[0;33m█████\\e[0m\e[0;34m█████\\e[0m\e[0;35m█████\\e[0m\e[0;36m█████\\e[0m\e[0;37m█████\\e[0m" + echo -e "\e[0m\e[1;30m█████\\e[0m\e[1;31m█████\\e[0m\e[1;32m█████\\e[0m\e[1;33m█████\\e[0m\e[1;34m█████\\e[0m\e[1;35m█████\\e[0m\e[1;36m█████\\e[0m\e[1;37m█████\\e[0m" } diff --git a/themes/3024-day.sh b/themes/3024-day.sh index 139ca42..7e10355 100755 --- a/themes/3024-day.sh +++ b/themes/3024-day.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#090300" # HOST -COLOR_02="#db2d20" # SYNTAX_STRING -COLOR_03="#01a252" # COMMAND -COLOR_04="#fded02" # COMMAND_COLOR2 -COLOR_05="#01a0e4" # PATH -COLOR_06="#a16a94" # SYNTAX_VAR -COLOR_07="#b5e4f4" # PROMP -COLOR_08="#a5a2a2" # +export COLOR_01="#090300" # HOST +export COLOR_02="#db2d20" # SYNTAX_STRING +export COLOR_03="#01a252" # COMMAND +export COLOR_04="#fded02" # COMMAND_COLOR2 +export COLOR_05="#01a0e4" # PATH +export COLOR_06="#a16a94" # SYNTAX_VAR +export COLOR_07="#b5e4f4" # PROMP +export COLOR_08="#a5a2a2" # -COLOR_09="#5c5855" # -COLOR_10="#e8bbd0" # COMMAND_ERROR -COLOR_11="#3a3432" # EXEC -COLOR_12="#4a4543" # -COLOR_13="#807d7c" # FOLDER -COLOR_14="#d6d5d4" # -COLOR_15="#cdab53" # -COLOR_16="#f7f7f7" # +export COLOR_09="#5c5855" # +export COLOR_10="#e8bbd0" # COMMAND_ERROR +export COLOR_11="#3a3432" # EXEC +export COLOR_12="#4a4543" # +export COLOR_13="#807d7c" # FOLDER +export COLOR_14="#d6d5d4" # +export COLOR_15="#cdab53" # +export COLOR_16="#f7f7f7" # -BACKGROUND_COLOR="#f7f7f7" # Background Color -FOREGROUND_COLOR="#4a4543" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="3024 Day" +export BACKGROUND_COLOR="#f7f7f7" # Background Color +export FOREGROUND_COLOR="#4a4543" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="3024 Day" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="3024 Day" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/3024-night.sh b/themes/3024-night.sh index 72e0cb3..d6b4ce0 100755 --- a/themes/3024-night.sh +++ b/themes/3024-night.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#090300" # HOST -COLOR_02="#db2d20" # SYNTAX_STRING -COLOR_03="#01a252" # COMMAND -COLOR_04="#fded02" # COMMAND_COLOR2 -COLOR_05="#01a0e4" # PATH -COLOR_06="#a16a94" # SYNTAX_VAR -COLOR_07="#b5e4f4" # PROMP -COLOR_08="#a5a2a2" # +export COLOR_01="#090300" # HOST +export COLOR_02="#db2d20" # SYNTAX_STRING +export COLOR_03="#01a252" # COMMAND +export COLOR_04="#fded02" # COMMAND_COLOR2 +export COLOR_05="#01a0e4" # PATH +export COLOR_06="#a16a94" # SYNTAX_VAR +export COLOR_07="#b5e4f4" # PROMP +export COLOR_08="#a5a2a2" # -COLOR_09="#5c5855" # -COLOR_10="#e8bbd0" # COMMAND_ERROR -COLOR_11="#3a3432" # EXEC -COLOR_12="#4a4543" # -COLOR_13="#807d7c" # FOLDER -COLOR_14="#d6d5d4" # -COLOR_15="#cdab53" # -COLOR_16="#f7f7f7" # +export COLOR_09="#5c5855" # +export COLOR_10="#e8bbd0" # COMMAND_ERROR +export COLOR_11="#3a3432" # EXEC +export COLOR_12="#4a4543" # +export COLOR_13="#807d7c" # FOLDER +export COLOR_14="#d6d5d4" # +export COLOR_15="#cdab53" # +export COLOR_16="#f7f7f7" # -BACKGROUND_COLOR="#090300" # Background Color -FOREGROUND_COLOR="#a5a2a2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="3024 Night" +export BACKGROUND_COLOR="#090300" # Background Color +export FOREGROUND_COLOR="#a5a2a2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="3024 Night" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="3024 Night" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/README.md b/themes/README.md index a811103..6e644b7 100755 --- a/themes/README.md +++ b/themes/README.md @@ -1,6 +1,6 @@ - -![elementary](https://raw.githubusercontent.com/Mayccoll/Gogh/master/images/gogh/Gogh-logo.png) - -## Themes: - - [Go to theme page :link:](http://mayccoll.github.io/Gogh/) + +![elementary](https://raw.githubusercontent.com/Mayccoll/Gogh/master/images/gogh/Gogh-logo.png) + +## Themes: + + [Go to theme page :link:](http://mayccoll.github.io/Gogh/) diff --git a/themes/_base.sh b/themes/_base.sh index b7d6e9e..0465791 100755 --- a/themes/_base.sh +++ b/themes/_base.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#44475a" # Black -COLOR_02="#ff5555" # Red -COLOR_03="#50fa7b" # Green -COLOR_04="#ffb86c" # Yellow -COLOR_05="#8be9fd" # Blue -COLOR_06="#bd93f9" # Cyan -COLOR_07="#ff79c6" # Magenta -COLOR_08="#94A3A5" # Light gray +export COLOR_01="#44475a" # Black +export COLOR_02="#ff5555" # Red +export COLOR_03="#50fa7b" # Green +export COLOR_04="#ffb86c" # Yellow +export COLOR_05="#8be9fd" # Blue +export COLOR_06="#bd93f9" # Cyan +export COLOR_07="#ff79c6" # Magenta +export COLOR_08="#94A3A5" # Light gray -COLOR_09="#000000" # Dark gray -COLOR_10="#ff5555" # Light Red -COLOR_11="#50fa7b" # Light Green -COLOR_12="#ffb86c" # Light Yellow -COLOR_13="#8be9fd" # Light Blue -COLOR_14="#bd93f9" # Light Cyan -COLOR_15="#ff79c6" # Light Magenta -COLOR_16="#ffffff" # White +export COLOR_09="#000000" # Dark gray +export COLOR_10="#ff5555" # Light Red +export COLOR_11="#50fa7b" # Light Green +export COLOR_12="#ffb86c" # Light Yellow +export COLOR_13="#8be9fd" # Light Blue +export COLOR_14="#bd93f9" # Light Cyan +export COLOR_15="#ff79c6" # Light Magenta +export COLOR_16="#ffffff" # White -BACKGROUND_COLOR="#282a36" # Background Color -FOREGROUND_COLOR="#94A3A5" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="_base" +export BACKGROUND_COLOR="#282a36" # Background Color +export FOREGROUND_COLOR="#94A3A5" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="_base" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="_base" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/aci.sh b/themes/aci.sh index 67733f1..d582e86 100755 --- a/themes/aci.sh +++ b/themes/aci.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#363636" # HOST -COLOR_02="#ff0883" # SYNTAX_STRING -COLOR_03="#83ff08" # COMMAND -COLOR_04="#ff8308" # COMMAND_COLOR2 -COLOR_05="#0883ff" # PATH -COLOR_06="#8308ff" # SYNTAX_VAR -COLOR_07="#08ff83" # PROMP -COLOR_08="#b6b6b6" # +export COLOR_01="#363636" # HOST +export COLOR_02="#ff0883" # SYNTAX_STRING +export COLOR_03="#83ff08" # COMMAND +export COLOR_04="#ff8308" # COMMAND_COLOR2 +export COLOR_05="#0883ff" # PATH +export COLOR_06="#8308ff" # SYNTAX_VAR +export COLOR_07="#08ff83" # PROMP +export COLOR_08="#b6b6b6" # -COLOR_09="#424242" # -COLOR_10="#ff1e8e" # COMMAND_ERROR -COLOR_11="#8eff1e" # EXEC -COLOR_12="#ff8e1e" # -COLOR_13="#1e8eff" # FOLDER -COLOR_14="#8e1eff" # -COLOR_15="#1eff8e" # -COLOR_16="#c2c2c2" # +export COLOR_09="#424242" # +export COLOR_10="#ff1e8e" # COMMAND_ERROR +export COLOR_11="#8eff1e" # EXEC +export COLOR_12="#ff8e1e" # +export COLOR_13="#1e8eff" # FOLDER +export COLOR_14="#8e1eff" # +export COLOR_15="#1eff8e" # +export COLOR_16="#c2c2c2" # -BACKGROUND_COLOR="#0d1926" # Background Color -FOREGROUND_COLOR="#b4e1fd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Aci" +export BACKGROUND_COLOR="#0d1926" # Background Color +export FOREGROUND_COLOR="#b4e1fd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Aci" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Aci" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/aco.sh b/themes/aco.sh index 3ea492c..2ea8988 100755 --- a/themes/aco.sh +++ b/themes/aco.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#3f3f3f" # HOST -COLOR_02="#ff0883" # SYNTAX_STRING -COLOR_03="#83ff08" # COMMAND -COLOR_04="#ff8308" # COMMAND_COLOR2 -COLOR_05="#0883ff" # PATH -COLOR_06="#8308ff" # SYNTAX_VAR -COLOR_07="#08ff83" # PROMP -COLOR_08="#bebebe" # +export COLOR_01="#3f3f3f" # HOST +export COLOR_02="#ff0883" # SYNTAX_STRING +export COLOR_03="#83ff08" # COMMAND +export COLOR_04="#ff8308" # COMMAND_COLOR2 +export COLOR_05="#0883ff" # PATH +export COLOR_06="#8308ff" # SYNTAX_VAR +export COLOR_07="#08ff83" # PROMP +export COLOR_08="#bebebe" # -COLOR_09="#474747" # -COLOR_10="#ff1e8e" # COMMAND_ERROR -COLOR_11="#8eff1e" # EXEC -COLOR_12="#ff8e1e" # -COLOR_13="#1e8eff" # FOLDER -COLOR_14="#8e1eff" # -COLOR_15="#1eff8e" # -COLOR_16="#c4c4c4" # +export COLOR_09="#474747" # +export COLOR_10="#ff1e8e" # COMMAND_ERROR +export COLOR_11="#8eff1e" # EXEC +export COLOR_12="#ff8e1e" # +export COLOR_13="#1e8eff" # FOLDER +export COLOR_14="#8e1eff" # +export COLOR_15="#1eff8e" # +export COLOR_16="#c4c4c4" # -BACKGROUND_COLOR="#1f1305" # Background Color -FOREGROUND_COLOR="#b4e1fd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Aco" +export BACKGROUND_COLOR="#1f1305" # Background Color +export FOREGROUND_COLOR="#b4e1fd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Aco" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Aco" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/adventuretime.sh b/themes/adventuretime.sh index bab917c..ce2c587 100755 --- a/themes/adventuretime.sh +++ b/themes/adventuretime.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#050404" # HOST -COLOR_02="#bd0013" # SYNTAX_STRING -COLOR_03="#4ab118" # COMMAND -COLOR_04="#e7741e" # COMMAND_COLOR2 -COLOR_05="#0f4ac6" # PATH -COLOR_06="#665993" # SYNTAX_VAR -COLOR_07="#70a598" # PROMP -COLOR_08="#f8dcc0" # +export COLOR_01="#050404" # HOST +export COLOR_02="#bd0013" # SYNTAX_STRING +export COLOR_03="#4ab118" # COMMAND +export COLOR_04="#e7741e" # COMMAND_COLOR2 +export COLOR_05="#0f4ac6" # PATH +export COLOR_06="#665993" # SYNTAX_VAR +export COLOR_07="#70a598" # PROMP +export COLOR_08="#f8dcc0" # -COLOR_09="#4e7cbf" # -COLOR_10="#fc5f5a" # COMMAND_ERROR -COLOR_11="#9eff6e" # EXEC -COLOR_12="#efc11a" # -COLOR_13="#1997c6" # FOLDER -COLOR_14="#9b5953" # -COLOR_15="#c8faf4" # -COLOR_16="#f6f5fb" # +export COLOR_09="#4e7cbf" # +export COLOR_10="#fc5f5a" # COMMAND_ERROR +export COLOR_11="#9eff6e" # EXEC +export COLOR_12="#efc11a" # +export COLOR_13="#1997c6" # FOLDER +export COLOR_14="#9b5953" # +export COLOR_15="#c8faf4" # +export COLOR_16="#f6f5fb" # -BACKGROUND_COLOR="#1f1d45" # Background Color -FOREGROUND_COLOR="#f8dcc0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Adventure Time" +export BACKGROUND_COLOR="#1f1d45" # Background Color +export FOREGROUND_COLOR="#f8dcc0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Adventure Time" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Adventure Time" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/afterglow.sh b/themes/afterglow.sh index 312c596..a7505b5 100755 --- a/themes/afterglow.sh +++ b/themes/afterglow.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#151515" # HOST -COLOR_02="#a53c23" # SYNTAX_STRING -COLOR_03="#7b9246" # COMMAND -COLOR_04="#d3a04d" # COMMAND_COLOR2 -COLOR_05="#6c99bb" # PATH -COLOR_06="#9f4e85" # SYNTAX_VAR -COLOR_07="#7dd6cf" # PROMP -COLOR_08="#d0d0d0" # +export COLOR_01="#151515" # HOST +export COLOR_02="#a53c23" # SYNTAX_STRING +export COLOR_03="#7b9246" # COMMAND +export COLOR_04="#d3a04d" # COMMAND_COLOR2 +export COLOR_05="#6c99bb" # PATH +export COLOR_06="#9f4e85" # SYNTAX_VAR +export COLOR_07="#7dd6cf" # PROMP +export COLOR_08="#d0d0d0" # -COLOR_09="#505050" # -COLOR_10="#a53c23" # COMMAND_ERROR -COLOR_11="#7b9246" # EXEC -COLOR_12="#d3a04d" # -COLOR_13="#547c99" # FOLDER -COLOR_14="#9f4e85" # -COLOR_15="#7dd6cf" # -COLOR_16="#f5f5f5" # +export COLOR_09="#505050" # +export COLOR_10="#a53c23" # COMMAND_ERROR +export COLOR_11="#7b9246" # EXEC +export COLOR_12="#d3a04d" # +export COLOR_13="#547c99" # FOLDER +export COLOR_14="#9f4e85" # +export COLOR_15="#7dd6cf" # +export COLOR_16="#f5f5f5" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#d0d0d0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Afterglow" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#d0d0d0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Afterglow" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Afterglow" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/alien-blood.sh b/themes/alien-blood.sh index 111d3a6..2c8c1da 100755 --- a/themes/alien-blood.sh +++ b/themes/alien-blood.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#112616" # HOST -COLOR_02="#7f2b27" # SYNTAX_STRING -COLOR_03="#2f7e25" # COMMAND -COLOR_04="#717f24" # COMMAND_COLOR2 -COLOR_05="#2f6a7f" # PATH -COLOR_06="#47587f" # SYNTAX_VAR -COLOR_07="#327f77" # PROMP -COLOR_08="#647d75" # +export COLOR_01="#112616" # HOST +export COLOR_02="#7f2b27" # SYNTAX_STRING +export COLOR_03="#2f7e25" # COMMAND +export COLOR_04="#717f24" # COMMAND_COLOR2 +export COLOR_05="#2f6a7f" # PATH +export COLOR_06="#47587f" # SYNTAX_VAR +export COLOR_07="#327f77" # PROMP +export COLOR_08="#647d75" # -COLOR_09="#3c4812" # -COLOR_10="#e08009" # COMMAND_ERROR -COLOR_11="#18e000" # EXEC -COLOR_12="#bde000" # -COLOR_13="#00aae0" # FOLDER -COLOR_14="#0058e0" # -COLOR_15="#00e0c4" # -COLOR_16="#73fa91" # +export COLOR_09="#3c4812" # +export COLOR_10="#e08009" # COMMAND_ERROR +export COLOR_11="#18e000" # EXEC +export COLOR_12="#bde000" # +export COLOR_13="#00aae0" # FOLDER +export COLOR_14="#0058e0" # +export COLOR_15="#00e0c4" # +export COLOR_16="#73fa91" # -BACKGROUND_COLOR="#0f1610" # Background Color -FOREGROUND_COLOR="#637d75" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Alien Blood" +export BACKGROUND_COLOR="#0f1610" # Background Color +export FOREGROUND_COLOR="#637d75" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Alien Blood" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Alien Blood" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/argonaut.sh b/themes/argonaut.sh index 568bea7..f6c11de 100755 --- a/themes/argonaut.sh +++ b/themes/argonaut.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#232323" # HOST -COLOR_02="#ff000f" # SYNTAX_STRING -COLOR_03="#8ce10b" # COMMAND -COLOR_04="#ffb900" # COMMAND_COLOR2 -COLOR_05="#008df8" # PATH -COLOR_06="#6d43a6" # SYNTAX_VAR -COLOR_07="#00d8eb" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#232323" # HOST +export COLOR_02="#ff000f" # SYNTAX_STRING +export COLOR_03="#8ce10b" # COMMAND +export COLOR_04="#ffb900" # COMMAND_COLOR2 +export COLOR_05="#008df8" # PATH +export COLOR_06="#6d43a6" # SYNTAX_VAR +export COLOR_07="#00d8eb" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#444444" # -COLOR_10="#ff2740" # COMMAND_ERROR -COLOR_11="#abe15b" # EXEC -COLOR_12="#ffd242" # -COLOR_13="#0092ff" # FOLDER -COLOR_14="#9a5feb" # -COLOR_15="#67fff0" # -COLOR_16="#ffffff" # +export COLOR_09="#444444" # +export COLOR_10="#ff2740" # COMMAND_ERROR +export COLOR_11="#abe15b" # EXEC +export COLOR_12="#ffd242" # +export COLOR_13="#0092ff" # FOLDER +export COLOR_14="#9a5feb" # +export COLOR_15="#67fff0" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0e1019" # Background Color -FOREGROUND_COLOR="#fffaf4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Argonaut" +export BACKGROUND_COLOR="#0e1019" # Background Color +export FOREGROUND_COLOR="#fffaf4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Argonaut" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Argonaut" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/arthur.sh b/themes/arthur.sh index ecbcb62..494e6c3 100755 --- a/themes/arthur.sh +++ b/themes/arthur.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#3d352a" # HOST -COLOR_02="#cd5c5c" # SYNTAX_STRING -COLOR_03="#86af80" # COMMAND -COLOR_04="#e8ae5b" # COMMAND_COLOR2 -COLOR_05="#6495ed" # PATH -COLOR_06="#deb887" # SYNTAX_VAR -COLOR_07="#b0c4de" # PROMP -COLOR_08="#bbaa99" # +export COLOR_01="#3d352a" # HOST +export COLOR_02="#cd5c5c" # SYNTAX_STRING +export COLOR_03="#86af80" # COMMAND +export COLOR_04="#e8ae5b" # COMMAND_COLOR2 +export COLOR_05="#6495ed" # PATH +export COLOR_06="#deb887" # SYNTAX_VAR +export COLOR_07="#b0c4de" # PROMP +export COLOR_08="#bbaa99" # -COLOR_09="#554444" # -COLOR_10="#cc5533" # COMMAND_ERROR -COLOR_11="#88aa22" # EXEC -COLOR_12="#ffa75d" # -COLOR_13="#87ceeb" # FOLDER -COLOR_14="#996600" # -COLOR_15="#b0c4de" # -COLOR_16="#ddccbb" # +export COLOR_09="#554444" # +export COLOR_10="#cc5533" # COMMAND_ERROR +export COLOR_11="#88aa22" # EXEC +export COLOR_12="#ffa75d" # +export COLOR_13="#87ceeb" # FOLDER +export COLOR_14="#996600" # +export COLOR_15="#b0c4de" # +export COLOR_16="#ddccbb" # -BACKGROUND_COLOR="#1c1c1c" # Background Color -FOREGROUND_COLOR="#ddeedd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Arthur" +export BACKGROUND_COLOR="#1c1c1c" # Background Color +export FOREGROUND_COLOR="#ddeedd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Arthur" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Arthur" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/atom.sh b/themes/atom.sh index d04d4ae..6966ceb 100755 --- a/themes/atom.sh +++ b/themes/atom.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#fd5ff1" # SYNTAX_STRING -COLOR_03="#87c38a" # COMMAND -COLOR_04="#ffd7b1" # COMMAND_COLOR2 -COLOR_05="#85befd" # PATH -COLOR_06="#b9b6fc" # SYNTAX_VAR -COLOR_07="#85befd" # PROMP -COLOR_08="#e0e0e0" # +export COLOR_01="#000000" # HOST +export COLOR_02="#fd5ff1" # SYNTAX_STRING +export COLOR_03="#87c38a" # COMMAND +export COLOR_04="#ffd7b1" # COMMAND_COLOR2 +export COLOR_05="#85befd" # PATH +export COLOR_06="#b9b6fc" # SYNTAX_VAR +export COLOR_07="#85befd" # PROMP +export COLOR_08="#e0e0e0" # -COLOR_09="#000000" # -COLOR_10="#fd5ff1" # COMMAND_ERROR -COLOR_11="#94fa36" # EXEC -COLOR_12="#f5ffa8" # -COLOR_13="#96cbfe" # FOLDER -COLOR_14="#b9b6fc" # -COLOR_15="#85befd" # -COLOR_16="#e0e0e0" # +export COLOR_09="#000000" # +export COLOR_10="#fd5ff1" # COMMAND_ERROR +export COLOR_11="#94fa36" # EXEC +export COLOR_12="#f5ffa8" # +export COLOR_13="#96cbfe" # FOLDER +export COLOR_14="#b9b6fc" # +export COLOR_15="#85befd" # +export COLOR_16="#e0e0e0" # -BACKGROUND_COLOR="#161719" # Background Color -FOREGROUND_COLOR="#c5c8c6" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Atom" +export BACKGROUND_COLOR="#161719" # Background Color +export FOREGROUND_COLOR="#c5c8c6" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Atom" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Atom" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/azu.sh b/themes/azu.sh index ca0c746..f77557e 100755 --- a/themes/azu.sh +++ b/themes/azu.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ac6d74" # SYNTAX_STRING -COLOR_03="#74ac6d" # COMMAND -COLOR_04="#aca46d" # COMMAND_COLOR2 -COLOR_05="#6d74ac" # PATH -COLOR_06="#a46dac" # SYNTAX_VAR -COLOR_07="#6daca4" # PROMP -COLOR_08="#e6e6e6" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ac6d74" # SYNTAX_STRING +export COLOR_03="#74ac6d" # COMMAND +export COLOR_04="#aca46d" # COMMAND_COLOR2 +export COLOR_05="#6d74ac" # PATH +export COLOR_06="#a46dac" # SYNTAX_VAR +export COLOR_07="#6daca4" # PROMP +export COLOR_08="#e6e6e6" # -COLOR_09="#262626" # -COLOR_10="#d6b8bc" # COMMAND_ERROR -COLOR_11="#bcd6b8" # EXEC -COLOR_12="#d6d3b8" # -COLOR_13="#b8bcd6" # FOLDER -COLOR_14="#d3b8d6" # -COLOR_15="#b8d6d3" # -COLOR_16="#ffffff" # +export COLOR_09="#262626" # +export COLOR_10="#d6b8bc" # COMMAND_ERROR +export COLOR_11="#bcd6b8" # EXEC +export COLOR_12="#d6d3b8" # +export COLOR_13="#b8bcd6" # FOLDER +export COLOR_14="#d3b8d6" # +export COLOR_15="#b8d6d3" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#09111a" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Azu" +export BACKGROUND_COLOR="#09111a" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Azu" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Azu" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/belafonte-day.sh b/themes/belafonte-day.sh index 923848e..f5c7af8 100755 --- a/themes/belafonte-day.sh +++ b/themes/belafonte-day.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#20111b" # HOST -COLOR_02="#be100e" # SYNTAX_STRING -COLOR_03="#858162" # COMMAND -COLOR_04="#eaa549" # COMMAND_COLOR2 -COLOR_05="#426a79" # PATH -COLOR_06="#97522c" # SYNTAX_VAR -COLOR_07="#989a9c" # PROMP -COLOR_08="#968c83" # +export COLOR_01="#20111b" # HOST +export COLOR_02="#be100e" # SYNTAX_STRING +export COLOR_03="#858162" # COMMAND +export COLOR_04="#eaa549" # COMMAND_COLOR2 +export COLOR_05="#426a79" # PATH +export COLOR_06="#97522c" # SYNTAX_VAR +export COLOR_07="#989a9c" # PROMP +export COLOR_08="#968c83" # -COLOR_09="#5e5252" # -COLOR_10="#be100e" # COMMAND_ERROR -COLOR_11="#858162" # EXEC -COLOR_12="#eaa549" # -COLOR_13="#426a79" # FOLDER -COLOR_14="#97522c" # -COLOR_15="#989a9c" # -COLOR_16="#d5ccba" # +export COLOR_09="#5e5252" # +export COLOR_10="#be100e" # COMMAND_ERROR +export COLOR_11="#858162" # EXEC +export COLOR_12="#eaa549" # +export COLOR_13="#426a79" # FOLDER +export COLOR_14="#97522c" # +export COLOR_15="#989a9c" # +export COLOR_16="#d5ccba" # -BACKGROUND_COLOR="#d5ccba" # Background Color -FOREGROUND_COLOR="#45373c" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Belafonte Day" +export BACKGROUND_COLOR="#d5ccba" # Background Color +export FOREGROUND_COLOR="#45373c" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Belafonte Day" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Belafonte Day" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/belafonte-night.sh b/themes/belafonte-night.sh index 9ddb363..00dcf61 100755 --- a/themes/belafonte-night.sh +++ b/themes/belafonte-night.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#20111b" # HOST -COLOR_02="#be100e" # SYNTAX_STRING -COLOR_03="#858162" # COMMAND -COLOR_04="#eaa549" # COMMAND_COLOR2 -COLOR_05="#426a79" # PATH -COLOR_06="#97522c" # SYNTAX_VAR -COLOR_07="#989a9c" # PROMP -COLOR_08="#968c83" # +export COLOR_01="#20111b" # HOST +export COLOR_02="#be100e" # SYNTAX_STRING +export COLOR_03="#858162" # COMMAND +export COLOR_04="#eaa549" # COMMAND_COLOR2 +export COLOR_05="#426a79" # PATH +export COLOR_06="#97522c" # SYNTAX_VAR +export COLOR_07="#989a9c" # PROMP +export COLOR_08="#968c83" # -COLOR_09="#5e5252" # -COLOR_10="#be100e" # COMMAND_ERROR -COLOR_11="#858162" # EXEC -COLOR_12="#eaa549" # -COLOR_13="#426a79" # FOLDER -COLOR_14="#97522c" # -COLOR_15="#989a9c" # -COLOR_16="#d5ccba" # +export COLOR_09="#5e5252" # +export COLOR_10="#be100e" # COMMAND_ERROR +export COLOR_11="#858162" # EXEC +export COLOR_12="#eaa549" # +export COLOR_13="#426a79" # FOLDER +export COLOR_14="#97522c" # +export COLOR_15="#989a9c" # +export COLOR_16="#d5ccba" # -BACKGROUND_COLOR="#20111b" # Background Color -FOREGROUND_COLOR="#968c83" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Belafonte Night" +export BACKGROUND_COLOR="#20111b" # Background Color +export FOREGROUND_COLOR="#968c83" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Belafonte Night" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Belafonte Night" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/bim.sh b/themes/bim.sh index c2e11c5..0b479b1 100755 --- a/themes/bim.sh +++ b/themes/bim.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2c2423" # HOST -COLOR_02="#f557a0" # SYNTAX_STRING -COLOR_03="#a9ee55" # COMMAND -COLOR_04="#f5a255" # COMMAND_COLOR2 -COLOR_05="#5ea2ec" # PATH -COLOR_06="#a957ec" # SYNTAX_VAR -COLOR_07="#5eeea0" # PROMP -COLOR_08="#918988" # +export COLOR_01="#2c2423" # HOST +export COLOR_02="#f557a0" # SYNTAX_STRING +export COLOR_03="#a9ee55" # COMMAND +export COLOR_04="#f5a255" # COMMAND_COLOR2 +export COLOR_05="#5ea2ec" # PATH +export COLOR_06="#a957ec" # SYNTAX_VAR +export COLOR_07="#5eeea0" # PROMP +export COLOR_08="#918988" # -COLOR_09="#918988" # -COLOR_10="#f579b2" # COMMAND_ERROR -COLOR_11="#bbee78" # EXEC -COLOR_12="#f5b378" # -COLOR_13="#81b3ec" # FOLDER -COLOR_14="#bb79ec" # -COLOR_15="#81eeb2" # -COLOR_16="#f5eeec" # +export COLOR_09="#918988" # +export COLOR_10="#f579b2" # COMMAND_ERROR +export COLOR_11="#bbee78" # EXEC +export COLOR_12="#f5b378" # +export COLOR_13="#81b3ec" # FOLDER +export COLOR_14="#bb79ec" # +export COLOR_15="#81eeb2" # +export COLOR_16="#f5eeec" # -BACKGROUND_COLOR="#012849" # Background Color -FOREGROUND_COLOR="#a9bed8" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Bim" +export BACKGROUND_COLOR="#012849" # Background Color +export FOREGROUND_COLOR="#a9bed8" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Bim" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Bim" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/birds-of-paradise.sh b/themes/birds-of-paradise.sh index aca7c6b..868e252 100755 --- a/themes/birds-of-paradise.sh +++ b/themes/birds-of-paradise.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#573d26" # HOST -COLOR_02="#be2d26" # SYNTAX_STRING -COLOR_03="#6ba18a" # COMMAND -COLOR_04="#e99d2a" # COMMAND_COLOR2 -COLOR_05="#5a86ad" # PATH -COLOR_06="#ac80a6" # SYNTAX_VAR -COLOR_07="#74a6ad" # PROMP -COLOR_08="#e0dbb7" # +export COLOR_01="#573d26" # HOST +export COLOR_02="#be2d26" # SYNTAX_STRING +export COLOR_03="#6ba18a" # COMMAND +export COLOR_04="#e99d2a" # COMMAND_COLOR2 +export COLOR_05="#5a86ad" # PATH +export COLOR_06="#ac80a6" # SYNTAX_VAR +export COLOR_07="#74a6ad" # PROMP +export COLOR_08="#e0dbb7" # -COLOR_09="#9b6c4a" # -COLOR_10="#e84627" # COMMAND_ERROR -COLOR_11="#95d8ba" # EXEC -COLOR_12="#d0d150" # -COLOR_13="#b8d3ed" # FOLDER -COLOR_14="#d19ecb" # -COLOR_15="#93cfd7" # -COLOR_16="#fff9d5" # +export COLOR_09="#9b6c4a" # +export COLOR_10="#e84627" # COMMAND_ERROR +export COLOR_11="#95d8ba" # EXEC +export COLOR_12="#d0d150" # +export COLOR_13="#b8d3ed" # FOLDER +export COLOR_14="#d19ecb" # +export COLOR_15="#93cfd7" # +export COLOR_16="#fff9d5" # -BACKGROUND_COLOR="#2a1f1d" # Background Color -FOREGROUND_COLOR="#e0dbb7" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Birds Of Paradise" +export BACKGROUND_COLOR="#2a1f1d" # Background Color +export FOREGROUND_COLOR="#e0dbb7" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Birds Of Paradise" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Birds Of Paradise" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/blazer.sh b/themes/blazer.sh index 8c042c3..459e319 100755 --- a/themes/blazer.sh +++ b/themes/blazer.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b87a7a" # SYNTAX_STRING -COLOR_03="#7ab87a" # COMMAND -COLOR_04="#b8b87a" # COMMAND_COLOR2 -COLOR_05="#7a7ab8" # PATH -COLOR_06="#b87ab8" # SYNTAX_VAR -COLOR_07="#7ab8b8" # PROMP -COLOR_08="#d9d9d9" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b87a7a" # SYNTAX_STRING +export COLOR_03="#7ab87a" # COMMAND +export COLOR_04="#b8b87a" # COMMAND_COLOR2 +export COLOR_05="#7a7ab8" # PATH +export COLOR_06="#b87ab8" # SYNTAX_VAR +export COLOR_07="#7ab8b8" # PROMP +export COLOR_08="#d9d9d9" # -COLOR_09="#262626" # -COLOR_10="#dbbdbd" # COMMAND_ERROR -COLOR_11="#bddbbd" # EXEC -COLOR_12="#dbdbbd" # -COLOR_13="#bdbddb" # FOLDER -COLOR_14="#dbbddb" # -COLOR_15="#bddbdb" # -COLOR_16="#ffffff" # +export COLOR_09="#262626" # +export COLOR_10="#dbbdbd" # COMMAND_ERROR +export COLOR_11="#bddbbd" # EXEC +export COLOR_12="#dbdbbd" # +export COLOR_13="#bdbddb" # FOLDER +export COLOR_14="#dbbddb" # +export COLOR_15="#bddbdb" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0d1926" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Blazer" +export BACKGROUND_COLOR="#0d1926" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Blazer" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Blazer" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/borland.sh b/themes/borland.sh index 8b0ca03..69d1983 100755 --- a/themes/borland.sh +++ b/themes/borland.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4f4f4f" # HOST -COLOR_02="#ff6c60" # SYNTAX_STRING -COLOR_03="#a8ff60" # COMMAND -COLOR_04="#ffffb6" # COMMAND_COLOR2 -COLOR_05="#96cbfe" # PATH -COLOR_06="#ff73fd" # SYNTAX_VAR -COLOR_07="#c6c5fe" # PROMP -COLOR_08="#eeeeee" # +export COLOR_01="#4f4f4f" # HOST +export COLOR_02="#ff6c60" # SYNTAX_STRING +export COLOR_03="#a8ff60" # COMMAND +export COLOR_04="#ffffb6" # COMMAND_COLOR2 +export COLOR_05="#96cbfe" # PATH +export COLOR_06="#ff73fd" # SYNTAX_VAR +export COLOR_07="#c6c5fe" # PROMP +export COLOR_08="#eeeeee" # -COLOR_09="#7c7c7c" # -COLOR_10="#ffb6b0" # COMMAND_ERROR -COLOR_11="#ceffac" # EXEC -COLOR_12="#ffffcc" # -COLOR_13="#b5dcff" # FOLDER -COLOR_14="#ff9cfe" # -COLOR_15="#dfdffe" # -COLOR_16="#ffffff" # +export COLOR_09="#7c7c7c" # +export COLOR_10="#ffb6b0" # COMMAND_ERROR +export COLOR_11="#ceffac" # EXEC +export COLOR_12="#ffffcc" # +export COLOR_13="#b5dcff" # FOLDER +export COLOR_14="#ff9cfe" # +export COLOR_15="#dfdffe" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0000a4" # Background Color -FOREGROUND_COLOR="#ffff4e" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Borland" +export BACKGROUND_COLOR="#0000a4" # Background Color +export FOREGROUND_COLOR="#ffff4e" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Borland" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Borland" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/broadcast.sh b/themes/broadcast.sh index a2308a6..bd76d3d 100755 --- a/themes/broadcast.sh +++ b/themes/broadcast.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#da4939" # SYNTAX_STRING -COLOR_03="#519f50" # COMMAND -COLOR_04="#ffd24a" # COMMAND_COLOR2 -COLOR_05="#6d9cbe" # PATH -COLOR_06="#d0d0ff" # SYNTAX_VAR -COLOR_07="#6e9cbe" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#000000" # HOST +export COLOR_02="#da4939" # SYNTAX_STRING +export COLOR_03="#519f50" # COMMAND +export COLOR_04="#ffd24a" # COMMAND_COLOR2 +export COLOR_05="#6d9cbe" # PATH +export COLOR_06="#d0d0ff" # SYNTAX_VAR +export COLOR_07="#6e9cbe" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#323232" # -COLOR_10="#ff7b6b" # COMMAND_ERROR -COLOR_11="#83d182" # EXEC -COLOR_12="#ffff7c" # -COLOR_13="#9fcef0" # FOLDER -COLOR_14="#ffffff" # -COLOR_15="#a0cef0" # -COLOR_16="#ffffff" # +export COLOR_09="#323232" # +export COLOR_10="#ff7b6b" # COMMAND_ERROR +export COLOR_11="#83d182" # EXEC +export COLOR_12="#ffff7c" # +export COLOR_13="#9fcef0" # FOLDER +export COLOR_14="#ffffff" # +export COLOR_15="#a0cef0" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#2b2b2b" # Background Color -FOREGROUND_COLOR="#e6e1dc" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Broadcast" +export BACKGROUND_COLOR="#2b2b2b" # Background Color +export FOREGROUND_COLOR="#e6e1dc" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Broadcast" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Broadcast" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/brogrammer.sh b/themes/brogrammer.sh index f2355bc..46d0457 100755 --- a/themes/brogrammer.sh +++ b/themes/brogrammer.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1f1f1f" # HOST -COLOR_02="#f81118" # SYNTAX_STRING -COLOR_03="#2dc55e" # COMMAND -COLOR_04="#ecba0f" # COMMAND_COLOR2 -COLOR_05="#2a84d2" # PATH -COLOR_06="#4e5ab7" # SYNTAX_VAR -COLOR_07="#1081d6" # PROMP -COLOR_08="#d6dbe5" # +export COLOR_01="#1f1f1f" # HOST +export COLOR_02="#f81118" # SYNTAX_STRING +export COLOR_03="#2dc55e" # COMMAND +export COLOR_04="#ecba0f" # COMMAND_COLOR2 +export COLOR_05="#2a84d2" # PATH +export COLOR_06="#4e5ab7" # SYNTAX_VAR +export COLOR_07="#1081d6" # PROMP +export COLOR_08="#d6dbe5" # -COLOR_09="#d6dbe5" # -COLOR_10="#de352e" # COMMAND_ERROR -COLOR_11="#1dd361" # EXEC -COLOR_12="#f3bd09" # -COLOR_13="#1081d6" # FOLDER -COLOR_14="#5350b9" # -COLOR_15="#0f7ddb" # -COLOR_16="#ffffff" # +export COLOR_09="#d6dbe5" # +export COLOR_10="#de352e" # COMMAND_ERROR +export COLOR_11="#1dd361" # EXEC +export COLOR_12="#f3bd09" # +export COLOR_13="#1081d6" # FOLDER +export COLOR_14="#5350b9" # +export COLOR_15="#0f7ddb" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#131313" # Background Color -FOREGROUND_COLOR="#d6dbe5" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Brogrammer" +export BACKGROUND_COLOR="#131313" # Background Color +export FOREGROUND_COLOR="#d6dbe5" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Brogrammer" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Brogrammer" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/c64.sh b/themes/c64.sh index 6c3908a..8d18f7b 100755 --- a/themes/c64.sh +++ b/themes/c64.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#090300" # HOST -COLOR_02="#883932" # SYNTAX_STRING -COLOR_03="#55a049" # COMMAND -COLOR_04="#bfce72" # COMMAND_COLOR2 -COLOR_05="#40318d" # PATH -COLOR_06="#8b3f96" # SYNTAX_VAR -COLOR_07="#67b6bd" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#090300" # HOST +export COLOR_02="#883932" # SYNTAX_STRING +export COLOR_03="#55a049" # COMMAND +export COLOR_04="#bfce72" # COMMAND_COLOR2 +export COLOR_05="#40318d" # PATH +export COLOR_06="#8b3f96" # SYNTAX_VAR +export COLOR_07="#67b6bd" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#000000" # -COLOR_10="#883932" # COMMAND_ERROR -COLOR_11="#55a049" # EXEC -COLOR_12="#bfce72" # -COLOR_13="#40318d" # FOLDER -COLOR_14="#8b3f96" # -COLOR_15="#67b6bd" # -COLOR_16="#f7f7f7" # +export COLOR_09="#000000" # +export COLOR_10="#883932" # COMMAND_ERROR +export COLOR_11="#55a049" # EXEC +export COLOR_12="#bfce72" # +export COLOR_13="#40318d" # FOLDER +export COLOR_14="#8b3f96" # +export COLOR_15="#67b6bd" # +export COLOR_16="#f7f7f7" # -BACKGROUND_COLOR="#40318d" # Background Color -FOREGROUND_COLOR="#7869c4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="C64" +export BACKGROUND_COLOR="#40318d" # Background Color +export FOREGROUND_COLOR="#7869c4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="C64" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="C64" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/cai.sh b/themes/cai.sh index 6bcbf22..6ee832d 100755 --- a/themes/cai.sh +++ b/themes/cai.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ca274d" # SYNTAX_STRING -COLOR_03="#4dca27" # COMMAND -COLOR_04="#caa427" # COMMAND_COLOR2 -COLOR_05="#274dca" # PATH -COLOR_06="#a427ca" # SYNTAX_VAR -COLOR_07="#27caa4" # PROMP -COLOR_08="#808080" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ca274d" # SYNTAX_STRING +export COLOR_03="#4dca27" # COMMAND +export COLOR_04="#caa427" # COMMAND_COLOR2 +export COLOR_05="#274dca" # PATH +export COLOR_06="#a427ca" # SYNTAX_VAR +export COLOR_07="#27caa4" # PROMP +export COLOR_08="#808080" # -COLOR_09="#808080" # -COLOR_10="#e98da3" # COMMAND_ERROR -COLOR_11="#a3e98d" # EXEC -COLOR_12="#e9d48d" # -COLOR_13="#8da3e9" # FOLDER -COLOR_14="#d48de9" # -COLOR_15="#8de9d4" # -COLOR_16="#ffffff" # +export COLOR_09="#808080" # +export COLOR_10="#e98da3" # COMMAND_ERROR +export COLOR_11="#a3e98d" # EXEC +export COLOR_12="#e9d48d" # +export COLOR_13="#8da3e9" # FOLDER +export COLOR_14="#d48de9" # +export COLOR_15="#8de9d4" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#09111a" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Cai" +export BACKGROUND_COLOR="#09111a" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Cai" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Cai" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/chalk.sh b/themes/chalk.sh index 5df92c7..3a311ff 100755 --- a/themes/chalk.sh +++ b/themes/chalk.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#646464" # HOST -COLOR_02="#F58E8E" # SYNTAX_STRING -COLOR_03="#A9D3AB" # COMMAND -COLOR_04="#FED37E" # COMMAND_COLOR2 -COLOR_05="#7AABD4" # PATH -COLOR_06="#D6ADD5" # SYNTAX_VAR -COLOR_07="#79D4D5" # PROMP -COLOR_08="#D4D4D4" # +export COLOR_01="#646464" # HOST +export COLOR_02="#F58E8E" # SYNTAX_STRING +export COLOR_03="#A9D3AB" # COMMAND +export COLOR_04="#FED37E" # COMMAND_COLOR2 +export COLOR_05="#7AABD4" # PATH +export COLOR_06="#D6ADD5" # SYNTAX_VAR +export COLOR_07="#79D4D5" # PROMP +export COLOR_08="#D4D4D4" # -COLOR_09="#646464" # -COLOR_10="#F58E8E" # COMMAND_ERROR -COLOR_11="#A9D3AB" # EXEC -COLOR_12="#FED37E" # -COLOR_13="#7AABD4" # FOLDER -COLOR_14="#D6ADD5" # -COLOR_15="#79D4D5" # -COLOR_16="#D4D4D4" # +export COLOR_09="#646464" # +export COLOR_10="#F58E8E" # COMMAND_ERROR +export COLOR_11="#A9D3AB" # EXEC +export COLOR_12="#FED37E" # +export COLOR_13="#7AABD4" # FOLDER +export COLOR_14="#D6ADD5" # +export COLOR_15="#79D4D5" # +export COLOR_16="#D4D4D4" # -BACKGROUND_COLOR="#2D2D2D" # Background Color -FOREGROUND_COLOR="#D4D4D4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Chalk" +export BACKGROUND_COLOR="#2D2D2D" # Background Color +export FOREGROUND_COLOR="#D4D4D4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Chalk" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Chalk" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/chalkboard.sh b/themes/chalkboard.sh index 4848cb8..4f0352d 100755 --- a/themes/chalkboard.sh +++ b/themes/chalkboard.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#c37372" # SYNTAX_STRING -COLOR_03="#72c373" # COMMAND -COLOR_04="#c2c372" # COMMAND_COLOR2 -COLOR_05="#7372c3" # PATH -COLOR_06="#c372c2" # SYNTAX_VAR -COLOR_07="#72c2c3" # PROMP -COLOR_08="#d9d9d9" # +export COLOR_01="#000000" # HOST +export COLOR_02="#c37372" # SYNTAX_STRING +export COLOR_03="#72c373" # COMMAND +export COLOR_04="#c2c372" # COMMAND_COLOR2 +export COLOR_05="#7372c3" # PATH +export COLOR_06="#c372c2" # SYNTAX_VAR +export COLOR_07="#72c2c3" # PROMP +export COLOR_08="#d9d9d9" # -COLOR_09="#323232" # -COLOR_10="#dbaaaa" # COMMAND_ERROR -COLOR_11="#aadbaa" # EXEC -COLOR_12="#dadbaa" # -COLOR_13="#aaaadb" # FOLDER -COLOR_14="#dbaada" # -COLOR_15="#aadadb" # -COLOR_16="#ffffff" # +export COLOR_09="#323232" # +export COLOR_10="#dbaaaa" # COMMAND_ERROR +export COLOR_11="#aadbaa" # EXEC +export COLOR_12="#dadbaa" # +export COLOR_13="#aaaadb" # FOLDER +export COLOR_14="#dbaada" # +export COLOR_15="#aadadb" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#29262f" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Chalkboard" +export BACKGROUND_COLOR="#29262f" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Chalkboard" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Chalkboard" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ciapre.sh b/themes/ciapre.sh index 663bc63..1ed2ec9 100755 --- a/themes/ciapre.sh +++ b/themes/ciapre.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#181818" # HOST -COLOR_02="#810009" # SYNTAX_STRING -COLOR_03="#48513b" # COMMAND -COLOR_04="#cc8b3f" # COMMAND_COLOR2 -COLOR_05="#576d8c" # PATH -COLOR_06="#724d7c" # SYNTAX_VAR -COLOR_07="#5c4f4b" # PROMP -COLOR_08="#aea47f" # +export COLOR_01="#181818" # HOST +export COLOR_02="#810009" # SYNTAX_STRING +export COLOR_03="#48513b" # COMMAND +export COLOR_04="#cc8b3f" # COMMAND_COLOR2 +export COLOR_05="#576d8c" # PATH +export COLOR_06="#724d7c" # SYNTAX_VAR +export COLOR_07="#5c4f4b" # PROMP +export COLOR_08="#aea47f" # -COLOR_09="#555555" # -COLOR_10="#ac3835" # COMMAND_ERROR -COLOR_11="#a6a75d" # EXEC -COLOR_12="#dcdf7c" # -COLOR_13="#3097c6" # FOLDER -COLOR_14="#d33061" # -COLOR_15="#f3dbb2" # -COLOR_16="#f4f4f4" # +export COLOR_09="#555555" # +export COLOR_10="#ac3835" # COMMAND_ERROR +export COLOR_11="#a6a75d" # EXEC +export COLOR_12="#dcdf7c" # +export COLOR_13="#3097c6" # FOLDER +export COLOR_14="#d33061" # +export COLOR_15="#f3dbb2" # +export COLOR_16="#f4f4f4" # -BACKGROUND_COLOR="#191c27" # Background Color -FOREGROUND_COLOR="#aea47a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Ciapre" +export BACKGROUND_COLOR="#191c27" # Background Color +export FOREGROUND_COLOR="#aea47a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Ciapre" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Ciapre" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/clone-of-ubuntu.sh b/themes/clone-of-ubuntu.sh index db29a59..39d009f 100755 --- a/themes/clone-of-ubuntu.sh +++ b/themes/clone-of-ubuntu.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2E3436" # Black -COLOR_02="#CC0000" # Red -COLOR_03="#4E9A06" # Green -COLOR_04="#C4A000" # Yellow -COLOR_05="#3465A4" # Blue -COLOR_06="#75507B" # Cyan -COLOR_07="#06989A" # Magenta -COLOR_08="#D3D7CF" # Light gray +export COLOR_01="#2E3436" # Black +export COLOR_02="#CC0000" # Red +export COLOR_03="#4E9A06" # Green +export COLOR_04="#C4A000" # Yellow +export COLOR_05="#3465A4" # Blue +export COLOR_06="#75507B" # Cyan +export COLOR_07="#06989A" # Magenta +export COLOR_08="#D3D7CF" # Light gray -COLOR_09="#555753" # Dark gray -COLOR_10="#EF2929" # Light Red -COLOR_11="#8AE234" # Light Green -COLOR_12="#FCE94F" # Light Yellow -COLOR_13="#729FCF" # Light Blue -COLOR_14="#AD7FA8" # Light Cyan -COLOR_15="#34E2E2" # Light Magenta -COLOR_16="#EEEEEC" # White +export COLOR_09="#555753" # Dark gray +export COLOR_10="#EF2929" # Light Red +export COLOR_11="#8AE234" # Light Green +export COLOR_12="#FCE94F" # Light Yellow +export COLOR_13="#729FCF" # Light Blue +export COLOR_14="#AD7FA8" # Light Cyan +export COLOR_15="#34E2E2" # Light Magenta +export COLOR_16="#EEEEEC" # White -BACKGROUND_COLOR="#300a24" # Background Color -FOREGROUND_COLOR="#ffffff" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="Clone of Ubuntu" +export BACKGROUND_COLOR="#300a24" # Background Color +export FOREGROUND_COLOR="#ffffff" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="Clone of Ubuntu" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="Clone of Ubuntu" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/clrs.sh b/themes/clrs.sh index f1b5714..2541c57 100755 --- a/themes/clrs.sh +++ b/themes/clrs.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#f8282a" # SYNTAX_STRING -COLOR_03="#328a5d" # COMMAND -COLOR_04="#fa701d" # COMMAND_COLOR2 -COLOR_05="#135cd0" # PATH -COLOR_06="#9f00bd" # SYNTAX_VAR -COLOR_07="#33c3c1" # PROMP -COLOR_08="#b3b3b3" # +export COLOR_01="#000000" # HOST +export COLOR_02="#f8282a" # SYNTAX_STRING +export COLOR_03="#328a5d" # COMMAND +export COLOR_04="#fa701d" # COMMAND_COLOR2 +export COLOR_05="#135cd0" # PATH +export COLOR_06="#9f00bd" # SYNTAX_VAR +export COLOR_07="#33c3c1" # PROMP +export COLOR_08="#b3b3b3" # -COLOR_09="#555753" # -COLOR_10="#fb0416" # COMMAND_ERROR -COLOR_11="#2cc631" # EXEC -COLOR_12="#fdd727" # -COLOR_13="#1670ff" # FOLDER -COLOR_14="#e900b0" # -COLOR_15="#3ad5ce" # -COLOR_16="#eeeeec" # +export COLOR_09="#555753" # +export COLOR_10="#fb0416" # COMMAND_ERROR +export COLOR_11="#2cc631" # EXEC +export COLOR_12="#fdd727" # +export COLOR_13="#1670ff" # FOLDER +export COLOR_14="#e900b0" # +export COLOR_15="#3ad5ce" # +export COLOR_16="#eeeeec" # -BACKGROUND_COLOR="#ffffff" # Background Color -FOREGROUND_COLOR="#262626" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="CLRS" +export BACKGROUND_COLOR="#ffffff" # Background Color +export FOREGROUND_COLOR="#262626" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="CLRS" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="CLRS" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/cobalt-neon.sh b/themes/cobalt-neon.sh index 933026f..d21447b 100755 --- a/themes/cobalt-neon.sh +++ b/themes/cobalt-neon.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#142631" # HOST -COLOR_02="#ff2320" # SYNTAX_STRING -COLOR_03="#3ba5ff" # COMMAND -COLOR_04="#e9e75c" # COMMAND_COLOR2 -COLOR_05="#8ff586" # PATH -COLOR_06="#781aa0" # SYNTAX_VAR -COLOR_07="#8ff586" # PROMP -COLOR_08="#ba46b2" # +export COLOR_01="#142631" # HOST +export COLOR_02="#ff2320" # SYNTAX_STRING +export COLOR_03="#3ba5ff" # COMMAND +export COLOR_04="#e9e75c" # COMMAND_COLOR2 +export COLOR_05="#8ff586" # PATH +export COLOR_06="#781aa0" # SYNTAX_VAR +export COLOR_07="#8ff586" # PROMP +export COLOR_08="#ba46b2" # -COLOR_09="#fff688" # -COLOR_10="#d4312e" # COMMAND_ERROR -COLOR_11="#8ff586" # EXEC -COLOR_12="#e9f06d" # -COLOR_13="#3c7dd2" # FOLDER -COLOR_14="#8230a7" # -COLOR_15="#6cbc67" # -COLOR_16="#8ff586" # +export COLOR_09="#fff688" # +export COLOR_10="#d4312e" # COMMAND_ERROR +export COLOR_11="#8ff586" # EXEC +export COLOR_12="#e9f06d" # +export COLOR_13="#3c7dd2" # FOLDER +export COLOR_14="#8230a7" # +export COLOR_15="#6cbc67" # +export COLOR_16="#8ff586" # -BACKGROUND_COLOR="#142838" # Background Color -FOREGROUND_COLOR="#8ff586" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Cobalt Neon" +export BACKGROUND_COLOR="#142838" # Background Color +export FOREGROUND_COLOR="#8ff586" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Cobalt Neon" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Cobalt Neon" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/cobalt2.sh b/themes/cobalt2.sh index a57cd03..7275ebc 100755 --- a/themes/cobalt2.sh +++ b/themes/cobalt2.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff0000" # SYNTAX_STRING -COLOR_03="#38de21" # COMMAND -COLOR_04="#ffe50a" # COMMAND_COLOR2 -COLOR_05="#1460d2" # PATH -COLOR_06="#ff005d" # SYNTAX_VAR -COLOR_07="#00bbbb" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff0000" # SYNTAX_STRING +export COLOR_03="#38de21" # COMMAND +export COLOR_04="#ffe50a" # COMMAND_COLOR2 +export COLOR_05="#1460d2" # PATH +export COLOR_06="#ff005d" # SYNTAX_VAR +export COLOR_07="#00bbbb" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#f40e17" # COMMAND_ERROR -COLOR_11="#3bd01d" # EXEC -COLOR_12="#edc809" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#6ae3fa" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#f40e17" # COMMAND_ERROR +export COLOR_11="#3bd01d" # EXEC +export COLOR_12="#edc809" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#6ae3fa" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#132738" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Cobalt 2" +export BACKGROUND_COLOR="#132738" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Cobalt 2" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Cobalt 2" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/crayon-pony-fish.sh b/themes/crayon-pony-fish.sh index f1736f4..fa18b67 100755 --- a/themes/crayon-pony-fish.sh +++ b/themes/crayon-pony-fish.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2b1b1d" # HOST -COLOR_02="#91002b" # SYNTAX_STRING -COLOR_03="#579524" # COMMAND -COLOR_04="#ab311b" # COMMAND_COLOR2 -COLOR_05="#8c87b0" # PATH -COLOR_06="#692f50" # SYNTAX_VAR -COLOR_07="#e8a866" # PROMP -COLOR_08="#68525a" # +export COLOR_01="#2b1b1d" # HOST +export COLOR_02="#91002b" # SYNTAX_STRING +export COLOR_03="#579524" # COMMAND +export COLOR_04="#ab311b" # COMMAND_COLOR2 +export COLOR_05="#8c87b0" # PATH +export COLOR_06="#692f50" # SYNTAX_VAR +export COLOR_07="#e8a866" # PROMP +export COLOR_08="#68525a" # -COLOR_09="#3d2b2e" # -COLOR_10="#c5255d" # COMMAND_ERROR -COLOR_11="#8dff57" # EXEC -COLOR_12="#c8381d" # -COLOR_13="#cfc9ff" # FOLDER -COLOR_14="#fc6cba" # -COLOR_15="#ffceaf" # -COLOR_16="#b0949d" # +export COLOR_09="#3d2b2e" # +export COLOR_10="#c5255d" # COMMAND_ERROR +export COLOR_11="#8dff57" # EXEC +export COLOR_12="#c8381d" # +export COLOR_13="#cfc9ff" # FOLDER +export COLOR_14="#fc6cba" # +export COLOR_15="#ffceaf" # +export COLOR_16="#b0949d" # -BACKGROUND_COLOR="#150707" # Background Color -FOREGROUND_COLOR="#68525a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Crayon Pony Fish" +export BACKGROUND_COLOR="#150707" # Background Color +export FOREGROUND_COLOR="#68525a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Crayon Pony Fish" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Crayon Pony Fish" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/dark-pastel.sh b/themes/dark-pastel.sh index 6eb3d2b..b1f9ddf 100755 --- a/themes/dark-pastel.sh +++ b/themes/dark-pastel.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff5555" # SYNTAX_STRING -COLOR_03="#55ff55" # COMMAND -COLOR_04="#ffff55" # COMMAND_COLOR2 -COLOR_05="#5555ff" # PATH -COLOR_06="#ff55ff" # SYNTAX_VAR -COLOR_07="#55ffff" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff5555" # SYNTAX_STRING +export COLOR_03="#55ff55" # COMMAND +export COLOR_04="#ffff55" # COMMAND_COLOR2 +export COLOR_05="#5555ff" # PATH +export COLOR_06="#ff55ff" # SYNTAX_VAR +export COLOR_07="#55ffff" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#55ff55" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#55ff55" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Dark Pastel" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Dark Pastel" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Dark Pastel" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/darkside.sh b/themes/darkside.sh index 667ac81..3ed1333 100755 --- a/themes/darkside.sh +++ b/themes/darkside.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#e8341c" # SYNTAX_STRING -COLOR_03="#68c256" # COMMAND -COLOR_04="#f2d42c" # COMMAND_COLOR2 -COLOR_05="#1c98e8" # PATH -COLOR_06="#8e69c9" # SYNTAX_VAR -COLOR_07="#1c98e8" # PROMP -COLOR_08="#bababa" # +export COLOR_01="#000000" # HOST +export COLOR_02="#e8341c" # SYNTAX_STRING +export COLOR_03="#68c256" # COMMAND +export COLOR_04="#f2d42c" # COMMAND_COLOR2 +export COLOR_05="#1c98e8" # PATH +export COLOR_06="#8e69c9" # SYNTAX_VAR +export COLOR_07="#1c98e8" # PROMP +export COLOR_08="#bababa" # -COLOR_09="#000000" # -COLOR_10="#e05a4f" # COMMAND_ERROR -COLOR_11="#77b869" # EXEC -COLOR_12="#efd64b" # -COLOR_13="#387cd3" # FOLDER -COLOR_14="#957bbe" # -COLOR_15="#3d97e2" # -COLOR_16="#bababa" # +export COLOR_09="#000000" # +export COLOR_10="#e05a4f" # COMMAND_ERROR +export COLOR_11="#77b869" # EXEC +export COLOR_12="#efd64b" # +export COLOR_13="#387cd3" # FOLDER +export COLOR_14="#957bbe" # +export COLOR_15="#3d97e2" # +export COLOR_16="#bababa" # -BACKGROUND_COLOR="#222324" # Background Color -FOREGROUND_COLOR="#bababa" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Darkside" +export BACKGROUND_COLOR="#222324" # Background Color +export FOREGROUND_COLOR="#bababa" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Darkside" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Darkside" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/desert.sh b/themes/desert.sh index 74138b6..e001442 100755 --- a/themes/desert.sh +++ b/themes/desert.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4d4d4d" # HOST -COLOR_02="#ff2b2b" # SYNTAX_STRING -COLOR_03="#98fb98" # COMMAND -COLOR_04="#f0e68c" # COMMAND_COLOR2 -COLOR_05="#cd853f" # PATH -COLOR_06="#ffdead" # SYNTAX_VAR -COLOR_07="#ffa0a0" # PROMP -COLOR_08="#f5deb3" # +export COLOR_01="#4d4d4d" # HOST +export COLOR_02="#ff2b2b" # SYNTAX_STRING +export COLOR_03="#98fb98" # COMMAND +export COLOR_04="#f0e68c" # COMMAND_COLOR2 +export COLOR_05="#cd853f" # PATH +export COLOR_06="#ffdead" # SYNTAX_VAR +export COLOR_07="#ffa0a0" # PROMP +export COLOR_08="#f5deb3" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#55ff55" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#87ceff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#ffd700" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#55ff55" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#87ceff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#ffd700" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#333333" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Desert" +export BACKGROUND_COLOR="#333333" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Desert" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Desert" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/dimmed-monokai.sh b/themes/dimmed-monokai.sh index a1d2476..344e8f9 100755 --- a/themes/dimmed-monokai.sh +++ b/themes/dimmed-monokai.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#3a3d43" # HOST -COLOR_02="#be3f48" # SYNTAX_STRING -COLOR_03="#879a3b" # COMMAND -COLOR_04="#c5a635" # COMMAND_COLOR2 -COLOR_05="#4f76a1" # PATH -COLOR_06="#855c8d" # SYNTAX_VAR -COLOR_07="#578fa4" # PROMP -COLOR_08="#b9bcba" # +export COLOR_01="#3a3d43" # HOST +export COLOR_02="#be3f48" # SYNTAX_STRING +export COLOR_03="#879a3b" # COMMAND +export COLOR_04="#c5a635" # COMMAND_COLOR2 +export COLOR_05="#4f76a1" # PATH +export COLOR_06="#855c8d" # SYNTAX_VAR +export COLOR_07="#578fa4" # PROMP +export COLOR_08="#b9bcba" # -COLOR_09="#888987" # -COLOR_10="#fb001f" # COMMAND_ERROR -COLOR_11="#0f722f" # EXEC -COLOR_12="#c47033" # -COLOR_13="#186de3" # FOLDER -COLOR_14="#fb0067" # -COLOR_15="#2e706d" # -COLOR_16="#fdffb9" # +export COLOR_09="#888987" # +export COLOR_10="#fb001f" # COMMAND_ERROR +export COLOR_11="#0f722f" # EXEC +export COLOR_12="#c47033" # +export COLOR_13="#186de3" # FOLDER +export COLOR_14="#fb0067" # +export COLOR_15="#2e706d" # +export COLOR_16="#fdffb9" # -BACKGROUND_COLOR="#1f1f1f" # Background Color -FOREGROUND_COLOR="#b9bcba" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Dimmed Monokai" +export BACKGROUND_COLOR="#1f1f1f" # Background Color +export FOREGROUND_COLOR="#b9bcba" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Dimmed Monokai" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Dimmed Monokai" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/dracula.sh b/themes/dracula.sh index 6e899f7..d76f038 100755 --- a/themes/dracula.sh +++ b/themes/dracula.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#44475a" # HOST -COLOR_02="#ff5555" # SYNTAX_STRING -COLOR_03="#50fa7b" # COMMAND -COLOR_04="#ffb86c" # COMMAND_COLOR2 -COLOR_05="#8be9fd" # PATH -COLOR_06="#bd93f9" # SYNTAX_VAR -COLOR_07="#ff79c6" # PROMP -COLOR_08="#94A3A5" # +export COLOR_01="#44475a" # HOST +export COLOR_02="#ff5555" # SYNTAX_STRING +export COLOR_03="#50fa7b" # COMMAND +export COLOR_04="#ffb86c" # COMMAND_COLOR2 +export COLOR_05="#8be9fd" # PATH +export COLOR_06="#bd93f9" # SYNTAX_VAR +export COLOR_07="#ff79c6" # PROMP +export COLOR_08="#94A3A5" # -COLOR_09="#000000" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#50fa7b" # EXEC -COLOR_12="#ffb86c" # -COLOR_13="#8be9fd" # FOLDER -COLOR_14="#bd93f9" # -COLOR_15="#ff79c6" # -COLOR_16="#ffffff" # +export COLOR_09="#000000" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#50fa7b" # EXEC +export COLOR_12="#ffb86c" # +export COLOR_13="#8be9fd" # FOLDER +export COLOR_14="#bd93f9" # +export COLOR_15="#ff79c6" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#282a36" # Background Color -FOREGROUND_COLOR="#94A3A5" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Dracula" +export BACKGROUND_COLOR="#282a36" # Background Color +export FOREGROUND_COLOR="#94A3A5" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Dracula" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Dracula" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/earthsong.sh b/themes/earthsong.sh index 5f9573d..c9ba224 100755 --- a/themes/earthsong.sh +++ b/themes/earthsong.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#121418" # HOST -COLOR_02="#c94234" # SYNTAX_STRING -COLOR_03="#85c54c" # COMMAND -COLOR_04="#f5ae2e" # COMMAND_COLOR2 -COLOR_05="#1398b9" # PATH -COLOR_06="#d0633d" # SYNTAX_VAR -COLOR_07="#509552" # PROMP -COLOR_08="#e5c6aa" # +export COLOR_01="#121418" # HOST +export COLOR_02="#c94234" # SYNTAX_STRING +export COLOR_03="#85c54c" # COMMAND +export COLOR_04="#f5ae2e" # COMMAND_COLOR2 +export COLOR_05="#1398b9" # PATH +export COLOR_06="#d0633d" # SYNTAX_VAR +export COLOR_07="#509552" # PROMP +export COLOR_08="#e5c6aa" # -COLOR_09="#675f54" # -COLOR_10="#ff645a" # COMMAND_ERROR -COLOR_11="#98e036" # EXEC -COLOR_12="#e0d561" # -COLOR_13="#5fdaff" # FOLDER -COLOR_14="#ff9269" # -COLOR_15="#84f088" # -COLOR_16="#f6f7ec" # +export COLOR_09="#675f54" # +export COLOR_10="#ff645a" # COMMAND_ERROR +export COLOR_11="#98e036" # EXEC +export COLOR_12="#e0d561" # +export COLOR_13="#5fdaff" # FOLDER +export COLOR_14="#ff9269" # +export COLOR_15="#84f088" # +export COLOR_16="#f6f7ec" # -BACKGROUND_COLOR="#292520" # Background Color -FOREGROUND_COLOR="#e5c7a9" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Earthsong" +export BACKGROUND_COLOR="#292520" # Background Color +export FOREGROUND_COLOR="#e5c7a9" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Earthsong" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Earthsong" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/elemental.sh b/themes/elemental.sh index a9dbd1f..22377ec 100755 --- a/themes/elemental.sh +++ b/themes/elemental.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#3c3c30" # HOST -COLOR_02="#98290f" # SYNTAX_STRING -COLOR_03="#479a43" # COMMAND -COLOR_04="#7f7111" # COMMAND_COLOR2 -COLOR_05="#497f7d" # PATH -COLOR_06="#7f4e2f" # SYNTAX_VAR -COLOR_07="#387f58" # PROMP -COLOR_08="#807974" # +export COLOR_01="#3c3c30" # HOST +export COLOR_02="#98290f" # SYNTAX_STRING +export COLOR_03="#479a43" # COMMAND +export COLOR_04="#7f7111" # COMMAND_COLOR2 +export COLOR_05="#497f7d" # PATH +export COLOR_06="#7f4e2f" # SYNTAX_VAR +export COLOR_07="#387f58" # PROMP +export COLOR_08="#807974" # -COLOR_09="#555445" # -COLOR_10="#e0502a" # COMMAND_ERROR -COLOR_11="#61e070" # EXEC -COLOR_12="#d69927" # -COLOR_13="#79d9d9" # FOLDER -COLOR_14="#cd7c54" # -COLOR_15="#59d599" # -COLOR_16="#fff1e9" # +export COLOR_09="#555445" # +export COLOR_10="#e0502a" # COMMAND_ERROR +export COLOR_11="#61e070" # EXEC +export COLOR_12="#d69927" # +export COLOR_13="#79d9d9" # FOLDER +export COLOR_14="#cd7c54" # +export COLOR_15="#59d599" # +export COLOR_16="#fff1e9" # -BACKGROUND_COLOR="#22211d" # Background Color -FOREGROUND_COLOR="#807a74" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Elemental" +export BACKGROUND_COLOR="#22211d" # Background Color +export FOREGROUND_COLOR="#807a74" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Elemental" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Elemental" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/elementary.sh b/themes/elementary.sh index cd0dbf3..53c1140 100755 --- a/themes/elementary.sh +++ b/themes/elementary.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#303030" # HOST -COLOR_02="#e1321a" # SYNTAX_STRING -COLOR_03="#6ab017" # COMMAND -COLOR_04="#ffc005" # COMMAND_COLOR2 -COLOR_05="#004f9e" # PATH -COLOR_06="#ec0048" # SYNTAX_VAR -COLOR_07="#2aa7e7" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#303030" # HOST +export COLOR_02="#e1321a" # SYNTAX_STRING +export COLOR_03="#6ab017" # COMMAND +export COLOR_04="#ffc005" # COMMAND_COLOR2 +export COLOR_05="#004f9e" # PATH +export COLOR_06="#ec0048" # SYNTAX_VAR +export COLOR_07="#2aa7e7" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#5d5d5d" # -COLOR_10="#ff361e" # COMMAND_ERROR -COLOR_11="#7bc91f" # EXEC -COLOR_12="#ffd00a" # -COLOR_13="#0071ff" # FOLDER -COLOR_14="#ff1d62" # -COLOR_15="#4bb8fd" # -COLOR_16="#a020f0" # +export COLOR_09="#5d5d5d" # +export COLOR_10="#ff361e" # COMMAND_ERROR +export COLOR_11="#7bc91f" # EXEC +export COLOR_12="#ffd00a" # +export COLOR_13="#0071ff" # FOLDER +export COLOR_14="#ff1d62" # +export COLOR_15="#4bb8fd" # +export COLOR_16="#a020f0" # -BACKGROUND_COLOR="#101010" # Background Color -FOREGROUND_COLOR="#f2f2f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Elementary" +export BACKGROUND_COLOR="#101010" # Background Color +export FOREGROUND_COLOR="#f2f2f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Elementary" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Elementary" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/elic.sh b/themes/elic.sh index b8d1590..fa52f54 100755 --- a/themes/elic.sh +++ b/themes/elic.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#303030" # HOST -COLOR_02="#e1321a" # SYNTAX_STRING -COLOR_03="#6ab017" # COMMAND -COLOR_04="#ffc005" # COMMAND_COLOR2 -COLOR_05="#729FCF" # PATH -COLOR_06="#ec0048" # SYNTAX_VAR -COLOR_07="#f2f2f2" # PROMP -COLOR_08="#2aa7e7" # +export COLOR_01="#303030" # HOST +export COLOR_02="#e1321a" # SYNTAX_STRING +export COLOR_03="#6ab017" # COMMAND +export COLOR_04="#ffc005" # COMMAND_COLOR2 +export COLOR_05="#729FCF" # PATH +export COLOR_06="#ec0048" # SYNTAX_VAR +export COLOR_07="#f2f2f2" # PROMP +export COLOR_08="#2aa7e7" # -COLOR_09="#5d5d5d" # -COLOR_10="#ff361e" # COMMAND_ERROR -COLOR_11="#7bc91f" # EXEC -COLOR_12="#ffd00a" # -COLOR_13="#0071ff" # FOLDER -COLOR_14="#ff1d62" # -COLOR_15="#4bb8fd" # -COLOR_16="#a020f0" # +export COLOR_09="#5d5d5d" # +export COLOR_10="#ff361e" # COMMAND_ERROR +export COLOR_11="#7bc91f" # EXEC +export COLOR_12="#ffd00a" # +export COLOR_13="#0071ff" # FOLDER +export COLOR_14="#ff1d62" # +export COLOR_15="#4bb8fd" # +export COLOR_16="#a020f0" # -BACKGROUND_COLOR="#4A453E" # Background Color -FOREGROUND_COLOR="#f2f2f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Elic" +export BACKGROUND_COLOR="#4A453E" # Background Color +export FOREGROUND_COLOR="#f2f2f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Elic" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Elic" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/elio.sh b/themes/elio.sh index 144e187..b423dce 100755 --- a/themes/elio.sh +++ b/themes/elio.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#303030" # HOST -COLOR_02="#e1321a" # SYNTAX_STRING -COLOR_03="#6ab017" # COMMAND -COLOR_04="#ffc005" # COMMAND_COLOR2 -COLOR_05="#729FCF" # PATH -COLOR_06="#ec0048" # SYNTAX_VAR -COLOR_07="#2aa7e7" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#303030" # HOST +export COLOR_02="#e1321a" # SYNTAX_STRING +export COLOR_03="#6ab017" # COMMAND +export COLOR_04="#ffc005" # COMMAND_COLOR2 +export COLOR_05="#729FCF" # PATH +export COLOR_06="#ec0048" # SYNTAX_VAR +export COLOR_07="#2aa7e7" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#5d5d5d" # -COLOR_10="#ff361e" # COMMAND_ERROR -COLOR_11="#7bc91f" # EXEC -COLOR_12="#ffd00a" # -COLOR_13="#0071ff" # FOLDER -COLOR_14="#ff1d62" # -COLOR_15="#4bb8fd" # -COLOR_16="#a020f0" # +export COLOR_09="#5d5d5d" # +export COLOR_10="#ff361e" # COMMAND_ERROR +export COLOR_11="#7bc91f" # EXEC +export COLOR_12="#ffd00a" # +export COLOR_13="#0071ff" # FOLDER +export COLOR_14="#ff1d62" # +export COLOR_15="#4bb8fd" # +export COLOR_16="#a020f0" # -BACKGROUND_COLOR="#041A3B" # Background Color -FOREGROUND_COLOR="#f2f2f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Elio" +export BACKGROUND_COLOR="#041A3B" # Background Color +export FOREGROUND_COLOR="#f2f2f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Elio" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Elio" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/espresso-libre.sh b/themes/espresso-libre.sh index 246fe0d..1c7bf7f 100755 --- a/themes/espresso-libre.sh +++ b/themes/espresso-libre.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#cc0000" # SYNTAX_STRING -COLOR_03="#1a921c" # COMMAND -COLOR_04="#f0e53a" # COMMAND_COLOR2 -COLOR_05="#0066ff" # PATH -COLOR_06="#c5656b" # SYNTAX_VAR -COLOR_07="#06989a" # PROMP -COLOR_08="#d3d7cf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#cc0000" # SYNTAX_STRING +export COLOR_03="#1a921c" # COMMAND +export COLOR_04="#f0e53a" # COMMAND_COLOR2 +export COLOR_05="#0066ff" # PATH +export COLOR_06="#c5656b" # SYNTAX_VAR +export COLOR_07="#06989a" # PROMP +export COLOR_08="#d3d7cf" # -COLOR_09="#555753" # -COLOR_10="#ef2929" # COMMAND_ERROR -COLOR_11="#9aff87" # EXEC -COLOR_12="#fffb5c" # -COLOR_13="#43a8ed" # FOLDER -COLOR_14="#ff818a" # -COLOR_15="#34e2e2" # -COLOR_16="#eeeeec" # +export COLOR_09="#555753" # +export COLOR_10="#ef2929" # COMMAND_ERROR +export COLOR_11="#9aff87" # EXEC +export COLOR_12="#fffb5c" # +export COLOR_13="#43a8ed" # FOLDER +export COLOR_14="#ff818a" # +export COLOR_15="#34e2e2" # +export COLOR_16="#eeeeec" # -BACKGROUND_COLOR="#2a211c" # Background Color -FOREGROUND_COLOR="#b8a898" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Espresso Libre" +export BACKGROUND_COLOR="#2a211c" # Background Color +export FOREGROUND_COLOR="#b8a898" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Espresso Libre" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Espresso Libre" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/espresso.sh b/themes/espresso.sh index 4255ff9..c11195c 100755 --- a/themes/espresso.sh +++ b/themes/espresso.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#353535" # HOST -COLOR_02="#d25252" # SYNTAX_STRING -COLOR_03="#a5c261" # COMMAND -COLOR_04="#ffc66d" # COMMAND_COLOR2 -COLOR_05="#6c99bb" # PATH -COLOR_06="#d197d9" # SYNTAX_VAR -COLOR_07="#bed6ff" # PROMP -COLOR_08="#eeeeec" # +export COLOR_01="#353535" # HOST +export COLOR_02="#d25252" # SYNTAX_STRING +export COLOR_03="#a5c261" # COMMAND +export COLOR_04="#ffc66d" # COMMAND_COLOR2 +export COLOR_05="#6c99bb" # PATH +export COLOR_06="#d197d9" # SYNTAX_VAR +export COLOR_07="#bed6ff" # PROMP +export COLOR_08="#eeeeec" # -COLOR_09="#535353" # -COLOR_10="#f00c0c" # COMMAND_ERROR -COLOR_11="#c2e075" # EXEC -COLOR_12="#e1e48b" # -COLOR_13="#8ab7d9" # FOLDER -COLOR_14="#efb5f7" # -COLOR_15="#dcf4ff" # -COLOR_16="#ffffff" # +export COLOR_09="#535353" # +export COLOR_10="#f00c0c" # COMMAND_ERROR +export COLOR_11="#c2e075" # EXEC +export COLOR_12="#e1e48b" # +export COLOR_13="#8ab7d9" # FOLDER +export COLOR_14="#efb5f7" # +export COLOR_15="#dcf4ff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#323232" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Espresso" +export BACKGROUND_COLOR="#323232" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Espresso" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Espresso" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/fishtank.sh b/themes/fishtank.sh index c77ae01..f5df7fc 100755 --- a/themes/fishtank.sh +++ b/themes/fishtank.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#03073c" # HOST -COLOR_02="#c6004a" # SYNTAX_STRING -COLOR_03="#acf157" # COMMAND -COLOR_04="#fecd5e" # COMMAND_COLOR2 -COLOR_05="#525fb8" # PATH -COLOR_06="#986f82" # SYNTAX_VAR -COLOR_07="#968763" # PROMP -COLOR_08="#ecf0fc" # +export COLOR_01="#03073c" # HOST +export COLOR_02="#c6004a" # SYNTAX_STRING +export COLOR_03="#acf157" # COMMAND +export COLOR_04="#fecd5e" # COMMAND_COLOR2 +export COLOR_05="#525fb8" # PATH +export COLOR_06="#986f82" # SYNTAX_VAR +export COLOR_07="#968763" # PROMP +export COLOR_08="#ecf0fc" # -COLOR_09="#6c5b30" # -COLOR_10="#da4b8a" # COMMAND_ERROR -COLOR_11="#dbffa9" # EXEC -COLOR_12="#fee6a9" # -COLOR_13="#b2befa" # FOLDER -COLOR_14="#fda5cd" # -COLOR_15="#a5bd86" # -COLOR_16="#f6ffec" # +export COLOR_09="#6c5b30" # +export COLOR_10="#da4b8a" # COMMAND_ERROR +export COLOR_11="#dbffa9" # EXEC +export COLOR_12="#fee6a9" # +export COLOR_13="#b2befa" # FOLDER +export COLOR_14="#fda5cd" # +export COLOR_15="#a5bd86" # +export COLOR_16="#f6ffec" # -BACKGROUND_COLOR="#232537" # Background Color -FOREGROUND_COLOR="#ecf0fe" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Fishtank" +export BACKGROUND_COLOR="#232537" # Background Color +export FOREGROUND_COLOR="#ecf0fe" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Fishtank" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Fishtank" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/flat.sh b/themes/flat.sh index 234aa5e..2c5bd2b 100755 --- a/themes/flat.sh +++ b/themes/flat.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2c3e50" # HOST -COLOR_02="#c0392b" # SYNTAX_STRING -COLOR_03="#27ae60" # COMMAND -COLOR_04="#f39c12" # COMMAND_COLOR2 -COLOR_05="#2980b9" # PATH -COLOR_06="#8e44ad" # SYNTAX_VAR -COLOR_07="#16a085" # PROMP -COLOR_08="#bdc3c7" # +export COLOR_01="#2c3e50" # HOST +export COLOR_02="#c0392b" # SYNTAX_STRING +export COLOR_03="#27ae60" # COMMAND +export COLOR_04="#f39c12" # COMMAND_COLOR2 +export COLOR_05="#2980b9" # PATH +export COLOR_06="#8e44ad" # SYNTAX_VAR +export COLOR_07="#16a085" # PROMP +export COLOR_08="#bdc3c7" # -COLOR_09="#34495e" # -COLOR_10="#e74c3c" # COMMAND_ERROR -COLOR_11="#2ecc71" # EXEC -COLOR_12="#f1c40f" # -COLOR_13="#3498db" # FOLDER -COLOR_14="#9b59b6" # -COLOR_15="#2AA198" # -COLOR_16="#ecf0f1" # +export COLOR_09="#34495e" # +export COLOR_10="#e74c3c" # COMMAND_ERROR +export COLOR_11="#2ecc71" # EXEC +export COLOR_12="#f1c40f" # +export COLOR_13="#3498db" # FOLDER +export COLOR_14="#9b59b6" # +export COLOR_15="#2AA198" # +export COLOR_16="#ecf0f1" # -BACKGROUND_COLOR="#1F2D3A" # Background Color -FOREGROUND_COLOR="#1abc9c" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Flat" +export BACKGROUND_COLOR="#1F2D3A" # Background Color +export FOREGROUND_COLOR="#1abc9c" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Flat" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Flat" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/flatland.sh b/themes/flatland.sh index 3c2fef5..ba61878 100755 --- a/themes/flatland.sh +++ b/themes/flatland.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1d1d19" # HOST -COLOR_02="#f18339" # SYNTAX_STRING -COLOR_03="#9fd364" # COMMAND -COLOR_04="#f4ef6d" # COMMAND_COLOR2 -COLOR_05="#5096be" # PATH -COLOR_06="#695abc" # SYNTAX_VAR -COLOR_07="#d63865" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#1d1d19" # HOST +export COLOR_02="#f18339" # SYNTAX_STRING +export COLOR_03="#9fd364" # COMMAND +export COLOR_04="#f4ef6d" # COMMAND_COLOR2 +export COLOR_05="#5096be" # PATH +export COLOR_06="#695abc" # SYNTAX_VAR +export COLOR_07="#d63865" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#1d1d19" # -COLOR_10="#d22a24" # COMMAND_ERROR -COLOR_11="#a7d42c" # EXEC -COLOR_12="#ff8949" # -COLOR_13="#61b9d0" # FOLDER -COLOR_14="#695abc" # -COLOR_15="#d63865" # -COLOR_16="#ffffff" # +export COLOR_09="#1d1d19" # +export COLOR_10="#d22a24" # COMMAND_ERROR +export COLOR_11="#a7d42c" # EXEC +export COLOR_12="#ff8949" # +export COLOR_13="#61b9d0" # FOLDER +export COLOR_14="#695abc" # +export COLOR_15="#d63865" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#1d1f21" # Background Color -FOREGROUND_COLOR="#b8dbef" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Flatland" +export BACKGROUND_COLOR="#1d1f21" # Background Color +export FOREGROUND_COLOR="#b8dbef" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Flatland" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Flatland" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/foxnightly.sh b/themes/foxnightly.sh index b9b4a61..7a5f283 100755 --- a/themes/foxnightly.sh +++ b/themes/foxnightly.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2A2A2E" # HOST | Black russian | list-text-color | maybe -COLOR_02="#B98EFF" # SYNTAX_STRING | Medium purple | html-attribute-value -COLOR_03="#FF7DE9" # COMMAND | Orchid | html-attribute-name -COLOR_04="#729FCF" # COMMAND_COLOR2 | Jordy blue | html-tag -COLOR_05="#66A05B" # PATH | De york | html-comment and doctype -COLOR_06="#75507B" # SYNTAX_VAR | Hot purple (import) list-bg-color | maybe -COLOR_07="#ACACAE" # PROMP | Dark grey | html-tag-angle-brackets -COLOR_08="#FFFFFF" # White | active list-bg (probably) +export COLOR_01="#2A2A2E" # HOST | Black russian | list-text-color | maybe +export COLOR_02="#B98EFF" # SYNTAX_STRING | Medium purple | html-attribute-value +export COLOR_03="#FF7DE9" # COMMAND | Orchid | html-attribute-name +export COLOR_04="#729FCF" # COMMAND_COLOR2 | Jordy blue | html-tag +export COLOR_05="#66A05B" # PATH | De york | html-comment and doctype +export COLOR_06="#75507B" # SYNTAX_VAR | Hot purple (import) list-bg-color | maybe +export COLOR_07="#ACACAE" # PROMP | Dark grey | html-tag-angle-brackets +export COLOR_08="#FFFFFF" # White | active list-bg (probably) -COLOR_09="#A40000" # UNKNOWN | Tomato -COLOR_10="#BF4040" # COMMAND_ERROR | Valencia (grep highlight) -COLOR_11="#66A05B" # EXEC | same as PATH (De york) (maybe) -COLOR_12="#FFB86C" # UNKNOWN | Rajah -COLOR_13="#729FCF" # FOLDER | Jordy blue | active:html-brackets/parenthesis -COLOR_14="#8F5902" # Mandalay | special sort of-files (probably) -COLOR_15="#C4A000" # (maybe) | Lemon -COLOR_16="#5C3566" # UNKNOWN | Honey flower +export COLOR_09="#A40000" # UNKNOWN | Tomato +export COLOR_10="#BF4040" # COMMAND_ERROR | Valencia (grep highlight) +export COLOR_11="#66A05B" # EXEC | same as PATH (De york) (maybe) +export COLOR_12="#FFB86C" # UNKNOWN | Rajah +export COLOR_13="#729FCF" # FOLDER | Jordy blue | active:html-brackets/parenthesis +export COLOR_14="#8F5902" # Mandalay | special sort of-files (probably) +export COLOR_15="#C4A000" # (maybe) | Lemon +export COLOR_16="#5C3566" # UNKNOWN | Honey flower -BACKGROUND_COLOR="#2A2A2E" # Background Color | Black russian | true -FOREGROUND_COLOR="#D7D7DB" # Text | Fuscous grey | html-tag-content -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Foxnightly" +export BACKGROUND_COLOR="#2A2A2E" # Background Color | Black russian | true +export FOREGROUND_COLOR="#D7D7DB" # Text | Fuscous grey | html-tag-content +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Foxnightly" # ============================================= # Mainly inspired by firefox developer/nightly (58) inspector theme @@ -35,22 +35,21 @@ PROFILE_NAME="Foxnightly" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/freya.sh b/themes/freya.sh index 9073324..1012ed1 100755 --- a/themes/freya.sh +++ b/themes/freya.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ==================== CONFIG THIS ========================================= # -COLOR_01="#073642" # HOST -COLOR_02="#dc322f" # SYNTAX_STRING -COLOR_03="#859900" # COMMAND -COLOR_04="#b58900" # COMMAND_COLOR2 -COLOR_05="#268bd2" # PATH -COLOR_06="#ec0048" # SYNTAX_VAR -COLOR_07="#2aa198" # PROMP -COLOR_08="#94a3a5" +export COLOR_01="#073642" # HOST +export COLOR_02="#dc322f" # SYNTAX_STRING +export COLOR_03="#859900" # COMMAND +export COLOR_04="#b58900" # COMMAND_COLOR2 +export COLOR_05="#268bd2" # PATH +export COLOR_06="#ec0048" # SYNTAX_VAR +export COLOR_07="#2aa198" # PROMP +export COLOR_08="#94a3a5" -COLOR_09="#586e75" -COLOR_10="#cb4b16" # COMMAND_ERROR -COLOR_11="#859900" # EXEC -COLOR_12="#b58900" -COLOR_13="#268bd2" # FOLDER -COLOR_14="#d33682" -COLOR_15="#2aa198" -COLOR_16="#6c71c4" +export COLOR_09="#586e75" +export COLOR_10="#cb4b16" # COMMAND_ERROR +export COLOR_11="#859900" # EXEC +export COLOR_12="#b58900" +export COLOR_13="#268bd2" # FOLDER +export COLOR_14="#d33682" +export COLOR_15="#2aa198" +export COLOR_16="#6c71c4" -BACKGROUND_COLOR="#252e32" # Background Color -FOREGROUND_COLOR="#94a3a5" # Text -CURSOR_COLOR="#839496" # Cursor -PROFILE_NAME="Freya" +export BACKGROUND_COLOR="#252e32" # Background Color +export FOREGROUND_COLOR="#94a3a5" # Text +export CURSOR_COLOR="#839496" # Cursor +export PROFILE_NAME="Freya" # ===================== END CONFIG ======================================= # @@ -34,22 +34,21 @@ PROFILE_NAME="Freya" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/frontend-delight.sh b/themes/frontend-delight.sh index a760dbd..133301a 100755 --- a/themes/frontend-delight.sh +++ b/themes/frontend-delight.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#242526" # HOST -COLOR_02="#f8511b" # SYNTAX_STRING -COLOR_03="#565747" # COMMAND -COLOR_04="#fa771d" # COMMAND_COLOR2 -COLOR_05="#2c70b7" # PATH -COLOR_06="#f02e4f" # SYNTAX_VAR -COLOR_07="#3ca1a6" # PROMP -COLOR_08="#adadad" # +export COLOR_01="#242526" # HOST +export COLOR_02="#f8511b" # SYNTAX_STRING +export COLOR_03="#565747" # COMMAND +export COLOR_04="#fa771d" # COMMAND_COLOR2 +export COLOR_05="#2c70b7" # PATH +export COLOR_06="#f02e4f" # SYNTAX_VAR +export COLOR_07="#3ca1a6" # PROMP +export COLOR_08="#adadad" # -COLOR_09="#5fac6d" # -COLOR_10="#f74319" # COMMAND_ERROR -COLOR_11="#74ec4c" # EXEC -COLOR_12="#fdc325" # -COLOR_13="#3393ca" # FOLDER -COLOR_14="#e75e4f" # -COLOR_15="#4fbce6" # -COLOR_16="#8c735b" # +export COLOR_09="#5fac6d" # +export COLOR_10="#f74319" # COMMAND_ERROR +export COLOR_11="#74ec4c" # EXEC +export COLOR_12="#fdc325" # +export COLOR_13="#3393ca" # FOLDER +export COLOR_14="#e75e4f" # +export COLOR_15="#4fbce6" # +export COLOR_16="#8c735b" # -BACKGROUND_COLOR="#1b1c1d" # Background Color -FOREGROUND_COLOR="#adadad" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Frontend Delight" +export BACKGROUND_COLOR="#1b1c1d" # Background Color +export FOREGROUND_COLOR="#adadad" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Frontend Delight" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Frontend Delight" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/frontend-fun-forrest.sh b/themes/frontend-fun-forrest.sh index 65776af..28d4bf6 100755 --- a/themes/frontend-fun-forrest.sh +++ b/themes/frontend-fun-forrest.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#d6262b" # SYNTAX_STRING -COLOR_03="#919c00" # COMMAND -COLOR_04="#be8a13" # COMMAND_COLOR2 -COLOR_05="#4699a3" # PATH -COLOR_06="#8d4331" # SYNTAX_VAR -COLOR_07="#da8213" # PROMP -COLOR_08="#ddc265" # +export COLOR_01="#000000" # HOST +export COLOR_02="#d6262b" # SYNTAX_STRING +export COLOR_03="#919c00" # COMMAND +export COLOR_04="#be8a13" # COMMAND_COLOR2 +export COLOR_05="#4699a3" # PATH +export COLOR_06="#8d4331" # SYNTAX_VAR +export COLOR_07="#da8213" # PROMP +export COLOR_08="#ddc265" # -COLOR_09="#7f6a55" # -COLOR_10="#e55a1c" # COMMAND_ERROR -COLOR_11="#bfc65a" # EXEC -COLOR_12="#ffcb1b" # -COLOR_13="#7cc9cf" # FOLDER -COLOR_14="#d26349" # -COLOR_15="#e6a96b" # -COLOR_16="#ffeaa3" # +export COLOR_09="#7f6a55" # +export COLOR_10="#e55a1c" # COMMAND_ERROR +export COLOR_11="#bfc65a" # EXEC +export COLOR_12="#ffcb1b" # +export COLOR_13="#7cc9cf" # FOLDER +export COLOR_14="#d26349" # +export COLOR_15="#e6a96b" # +export COLOR_16="#ffeaa3" # -BACKGROUND_COLOR="#251200" # Background Color -FOREGROUND_COLOR="#dec165" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Frontend Fun Forrest" +export BACKGROUND_COLOR="#251200" # Background Color +export FOREGROUND_COLOR="#dec165" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Frontend Fun Forrest" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Frontend Fun Forrest" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/frontend-galaxy.sh b/themes/frontend-galaxy.sh index dfb06bd..27b7fbe 100755 --- a/themes/frontend-galaxy.sh +++ b/themes/frontend-galaxy.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#f9555f" # SYNTAX_STRING -COLOR_03="#21b089" # COMMAND -COLOR_04="#fef02a" # COMMAND_COLOR2 -COLOR_05="#589df6" # PATH -COLOR_06="#944d95" # SYNTAX_VAR -COLOR_07="#1f9ee7" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#f9555f" # SYNTAX_STRING +export COLOR_03="#21b089" # COMMAND +export COLOR_04="#fef02a" # COMMAND_COLOR2 +export COLOR_05="#589df6" # PATH +export COLOR_06="#944d95" # SYNTAX_VAR +export COLOR_07="#1f9ee7" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#fa8c8f" # COMMAND_ERROR -COLOR_11="#35bb9a" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#589df6" # FOLDER -COLOR_14="#e75699" # -COLOR_15="#3979bc" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#fa8c8f" # COMMAND_ERROR +export COLOR_11="#35bb9a" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#589df6" # FOLDER +export COLOR_14="#e75699" # +export COLOR_15="#3979bc" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#1d2837" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Frontend Galaxy" +export BACKGROUND_COLOR="#1d2837" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Frontend Galaxy" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Frontend Galaxy" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/github.sh b/themes/github.sh index 97d7d62..8220188 100755 --- a/themes/github.sh +++ b/themes/github.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#3e3e3e" # HOST -COLOR_02="#970b16" # SYNTAX_STRING -COLOR_03="#07962a" # COMMAND -COLOR_04="#f8eec7" # COMMAND_COLOR2 -COLOR_05="#003e8a" # PATH -COLOR_06="#e94691" # SYNTAX_VAR -COLOR_07="#89d1ec" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#3e3e3e" # HOST +export COLOR_02="#970b16" # SYNTAX_STRING +export COLOR_03="#07962a" # COMMAND +export COLOR_04="#f8eec7" # COMMAND_COLOR2 +export COLOR_05="#003e8a" # PATH +export COLOR_06="#e94691" # SYNTAX_VAR +export COLOR_07="#89d1ec" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#666666" # -COLOR_10="#de0000" # COMMAND_ERROR -COLOR_11="#87d5a2" # EXEC -COLOR_12="#f1d007" # -COLOR_13="#2e6cba" # FOLDER -COLOR_14="#ffa29f" # -COLOR_15="#1cfafe" # -COLOR_16="#ffffff" # +export COLOR_09="#666666" # +export COLOR_10="#de0000" # COMMAND_ERROR +export COLOR_11="#87d5a2" # EXEC +export COLOR_12="#f1d007" # +export COLOR_13="#2e6cba" # FOLDER +export COLOR_14="#ffa29f" # +export COLOR_15="#1cfafe" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#f4f4f4" # Background Color -FOREGROUND_COLOR="#3e3e3e" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Github" +export BACKGROUND_COLOR="#f4f4f4" # Background Color +export FOREGROUND_COLOR="#3e3e3e" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Github" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Github" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/gooey.sh b/themes/gooey.sh index f59738e..0c5108f 100755 --- a/themes/gooey.sh +++ b/themes/gooey.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000009" # Black -COLOR_02="#BB4F6C" # Red -COLOR_03="#72CCAE" # Green -COLOR_04="#C65E3D" # Yellow -COLOR_05="#58B6CA" # Blue -COLOR_06="#6488C4" # Cyan -COLOR_07="#8D84C6" # Magenta -COLOR_08="#858893" # Light gray +export COLOR_01="#000009" # Black +export COLOR_02="#BB4F6C" # Red +export COLOR_03="#72CCAE" # Green +export COLOR_04="#C65E3D" # Yellow +export COLOR_05="#58B6CA" # Blue +export COLOR_06="#6488C4" # Cyan +export COLOR_07="#8D84C6" # Magenta +export COLOR_08="#858893" # Light gray -COLOR_09="#1f222d" # Dark gray -COLOR_10="#ee829f" # Light Red -COLOR_11="#a5ffe1" # Light Green -COLOR_12="#f99170" # Light Yellow -COLOR_13="#8be9fd" # Light Blue -COLOR_14="#97bbf7" # Light Cyan -COLOR_15="#c0b7f9" # Light Magenta -COLOR_16="#ffffff" # White +export COLOR_09="#1f222d" # Dark gray +export COLOR_10="#ee829f" # Light Red +export COLOR_11="#a5ffe1" # Light Green +export COLOR_12="#f99170" # Light Yellow +export COLOR_13="#8be9fd" # Light Blue +export COLOR_14="#97bbf7" # Light Cyan +export COLOR_15="#c0b7f9" # Light Magenta +export COLOR_16="#ffffff" # White -BACKGROUND_COLOR="#0D101B" # Background Color -FOREGROUND_COLOR="#EBEEF9" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="gooey" +export BACKGROUND_COLOR="#0D101B" # Background Color +export FOREGROUND_COLOR="#EBEEF9" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="gooey" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="gooey" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/google-dark.sh b/themes/google-dark.sh index 71c2877..5e1317b 100755 --- a/themes/google-dark.sh +++ b/themes/google-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1D1F21" # Black -COLOR_02="#CC342B" # Red -COLOR_03="#198844" # Green -COLOR_04="#FBA922" # Yellow -COLOR_05="#3971ED" # Blue -COLOR_06="#A36AC7" # Cyan -COLOR_07="#3971ED" # Magenta -COLOR_08="#C5C8C6" # Light gray +export COLOR_01="#1D1F21" # Black +export COLOR_02="#CC342B" # Red +export COLOR_03="#198844" # Green +export COLOR_04="#FBA922" # Yellow +export COLOR_05="#3971ED" # Blue +export COLOR_06="#A36AC7" # Cyan +export COLOR_07="#3971ED" # Magenta +export COLOR_08="#C5C8C6" # Light gray -COLOR_09="#969896" # Dark gray -COLOR_10="#CC342B" # Light Red -COLOR_11="#198844" # Light Green -COLOR_12="#FBA922" # Light Yellow -COLOR_13="#3971ED" # Light Blue -COLOR_14="#A36AC7" # Light Cyan -COLOR_15="#3971ED" # Light Magenta -COLOR_16="#FFFFFF" # White +export COLOR_09="#969896" # Dark gray +export COLOR_10="#CC342B" # Light Red +export COLOR_11="#198844" # Light Green +export COLOR_12="#FBA922" # Light Yellow +export COLOR_13="#3971ED" # Light Blue +export COLOR_14="#A36AC7" # Light Cyan +export COLOR_15="#3971ED" # Light Magenta +export COLOR_16="#FFFFFF" # White -BACKGROUND_COLOR="#1D1F21" # Background Color -FOREGROUND_COLOR="#B4B7B4" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="base16: Google (dark)" +export BACKGROUND_COLOR="#1D1F21" # Background Color +export FOREGROUND_COLOR="#B4B7B4" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="base16: Google (dark)" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="base16: Google (dark)" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/google-light.sh b/themes/google-light.sh index 49229dd..c05fdc9 100755 --- a/themes/google-light.sh +++ b/themes/google-light.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#FFFFFF" # Black -COLOR_02="#CC342B" # Red -COLOR_03="#198844" # Green -COLOR_04="#FBA921" # Yellow -COLOR_05="#3870ED" # Blue -COLOR_06="#A26AC7" # Cyan -COLOR_07="#3870ED" # Magenta -COLOR_08="#373B41" # Light gray +export COLOR_01="#FFFFFF" # Black +export COLOR_02="#CC342B" # Red +export COLOR_03="#198844" # Green +export COLOR_04="#FBA921" # Yellow +export COLOR_05="#3870ED" # Blue +export COLOR_06="#A26AC7" # Cyan +export COLOR_07="#3870ED" # Magenta +export COLOR_08="#373B41" # Light gray -COLOR_09="#C5C8C6" # Dark gray -COLOR_10="#CC342B" # Light Red -COLOR_11="#198844" # Light Green -COLOR_12="#FBA921" # Light Yellow -COLOR_13="#3870ED" # Light Blue -COLOR_14="#A26AC7" # Light Cyan -COLOR_15="#3870ED" # Light Magenta -COLOR_16="#1D1F21" # White +export COLOR_09="#C5C8C6" # Dark gray +export COLOR_10="#CC342B" # Light Red +export COLOR_11="#198844" # Light Green +export COLOR_12="#FBA921" # Light Yellow +export COLOR_13="#3870ED" # Light Blue +export COLOR_14="#A26AC7" # Light Cyan +export COLOR_15="#3870ED" # Light Magenta +export COLOR_16="#1D1F21" # White -BACKGROUND_COLOR="#FFFFFF" # Background Color -FOREGROUND_COLOR="#969896" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="base16: Google (light)" +export BACKGROUND_COLOR="#FFFFFF" # Background Color +export FOREGROUND_COLOR="#969896" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="base16: Google (light)" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="base16: Google (light)" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/grape.sh b/themes/grape.sh index f04d800..2910e5e 100755 --- a/themes/grape.sh +++ b/themes/grape.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2d283f" # HOST -COLOR_02="#ed2261" # SYNTAX_STRING -COLOR_03="#1fa91b" # COMMAND -COLOR_04="#8ddc20" # COMMAND_COLOR2 -COLOR_05="#487df4" # PATH -COLOR_06="#8d35c9" # SYNTAX_VAR -COLOR_07="#3bdeed" # PROMP -COLOR_08="#9e9ea0" # +export COLOR_01="#2d283f" # HOST +export COLOR_02="#ed2261" # SYNTAX_STRING +export COLOR_03="#1fa91b" # COMMAND +export COLOR_04="#8ddc20" # COMMAND_COLOR2 +export COLOR_05="#487df4" # PATH +export COLOR_06="#8d35c9" # SYNTAX_VAR +export COLOR_07="#3bdeed" # PROMP +export COLOR_08="#9e9ea0" # -COLOR_09="#59516a" # -COLOR_10="#f0729a" # COMMAND_ERROR -COLOR_11="#53aa5e" # EXEC -COLOR_12="#b2dc87" # -COLOR_13="#a9bcec" # FOLDER -COLOR_14="#ad81c2" # -COLOR_15="#9de3eb" # -COLOR_16="#a288f7" # +export COLOR_09="#59516a" # +export COLOR_10="#f0729a" # COMMAND_ERROR +export COLOR_11="#53aa5e" # EXEC +export COLOR_12="#b2dc87" # +export COLOR_13="#a9bcec" # FOLDER +export COLOR_14="#ad81c2" # +export COLOR_15="#9de3eb" # +export COLOR_16="#a288f7" # -BACKGROUND_COLOR="#171423" # Background Color -FOREGROUND_COLOR="#9f9fa1" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Grape" +export BACKGROUND_COLOR="#171423" # Background Color +export FOREGROUND_COLOR="#9f9fa1" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Grape" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Grape" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/grass.sh b/themes/grass.sh index 6cc41f9..0878e84 100755 --- a/themes/grass.sh +++ b/themes/grass.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#bb0000" # SYNTAX_STRING -COLOR_03="#00bb00" # COMMAND -COLOR_04="#e7b000" # COMMAND_COLOR2 -COLOR_05="#0000a3" # PATH -COLOR_06="#950062" # SYNTAX_VAR -COLOR_07="#00bbbb" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#bb0000" # SYNTAX_STRING +export COLOR_03="#00bb00" # COMMAND +export COLOR_04="#e7b000" # COMMAND_COLOR2 +export COLOR_05="#0000a3" # PATH +export COLOR_06="#950062" # SYNTAX_VAR +export COLOR_07="#00bbbb" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#bb0000" # COMMAND_ERROR -COLOR_11="#00bb00" # EXEC -COLOR_12="#e7b000" # -COLOR_13="#0000bb" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#bb0000" # COMMAND_ERROR +export COLOR_11="#00bb00" # EXEC +export COLOR_12="#e7b000" # +export COLOR_13="#0000bb" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#13773d" # Background Color -FOREGROUND_COLOR="#fff0a5" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Grass" +export BACKGROUND_COLOR="#13773d" # Background Color +export FOREGROUND_COLOR="#fff0a5" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Grass" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Grass" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/gruvbox-dark.sh b/themes/gruvbox-dark.sh index 5e987cf..fee3c8d 100755 --- a/themes/gruvbox-dark.sh +++ b/themes/gruvbox-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#282828" # HOST -COLOR_02="#cc241d" # SYNTAX_STRING -COLOR_03="#98971a" # COMMAND -COLOR_04="#d79921" # COMMAND_COLOR2 -COLOR_05="#458588" # PATH -COLOR_06="#b16286" # SYNTAX_VAR -COLOR_07="#689d6a" # PROMP -COLOR_08="#a89984" # +export COLOR_01="#282828" # HOST +export COLOR_02="#cc241d" # SYNTAX_STRING +export COLOR_03="#98971a" # COMMAND +export COLOR_04="#d79921" # COMMAND_COLOR2 +export COLOR_05="#458588" # PATH +export COLOR_06="#b16286" # SYNTAX_VAR +export COLOR_07="#689d6a" # PROMP +export COLOR_08="#a89984" # -COLOR_09="#928374" # -COLOR_10="#fb4934" # COMMAND_ERROR -COLOR_11="#b8bb26" # EXEC -COLOR_12="#fabd2f" # -COLOR_13="#83a598" # FOLDER -COLOR_14="#d3869b" # -COLOR_15="#8ec07c" # -COLOR_16="#ebdbb2" # +export COLOR_09="#928374" # +export COLOR_10="#fb4934" # COMMAND_ERROR +export COLOR_11="#b8bb26" # EXEC +export COLOR_12="#fabd2f" # +export COLOR_13="#83a598" # FOLDER +export COLOR_14="#d3869b" # +export COLOR_15="#8ec07c" # +export COLOR_16="#ebdbb2" # -BACKGROUND_COLOR="#282828" # Background Color -FOREGROUND_COLOR="#ebdbb2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Gruvbox Dark" +export BACKGROUND_COLOR="#282828" # Background Color +export FOREGROUND_COLOR="#ebdbb2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Gruvbox Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Gruvbox Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/gruvbox.sh b/themes/gruvbox.sh index a689afc..79fbb38 100755 --- a/themes/gruvbox.sh +++ b/themes/gruvbox.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#fbf1c7" # HOST -COLOR_02="#cc241d" # SYNTAX_STRING -COLOR_03="#98971a" # COMMAND -COLOR_04="#d79921" # COMMAND_COLOR2 -COLOR_05="#458588" # PATH -COLOR_06="#b16286" # SYNTAX_VAR -COLOR_07="#689d6a" # PROMP -COLOR_08="#7c6f64" # +export COLOR_01="#fbf1c7" # HOST +export COLOR_02="#cc241d" # SYNTAX_STRING +export COLOR_03="#98971a" # COMMAND +export COLOR_04="#d79921" # COMMAND_COLOR2 +export COLOR_05="#458588" # PATH +export COLOR_06="#b16286" # SYNTAX_VAR +export COLOR_07="#689d6a" # PROMP +export COLOR_08="#7c6f64" # -COLOR_09="#928374" # -COLOR_10="#9d0006" # COMMAND_ERROR -COLOR_11="#79740e" # EXEC -COLOR_12="#b57614" # -COLOR_13="#076678" # FOLDER -COLOR_14="#8f3f71" # -COLOR_15="#427b58" # -COLOR_16="#3c3836" # +export COLOR_09="#928374" # +export COLOR_10="#9d0006" # COMMAND_ERROR +export COLOR_11="#79740e" # EXEC +export COLOR_12="#b57614" # +export COLOR_13="#076678" # FOLDER +export COLOR_14="#8f3f71" # +export COLOR_15="#427b58" # +export COLOR_16="#3c3836" # -BACKGROUND_COLOR="#fbf1c7" # Background Color -FOREGROUND_COLOR="#3c3836" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Gruvbox" +export BACKGROUND_COLOR="#fbf1c7" # Background Color +export FOREGROUND_COLOR="#3c3836" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Gruvbox" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Gruvbox" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hardcore.sh b/themes/hardcore.sh index c66aede..82509ce 100755 --- a/themes/hardcore.sh +++ b/themes/hardcore.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1b1d1e" # HOST -COLOR_02="#f92672" # SYNTAX_STRING -COLOR_03="#a6e22e" # COMMAND -COLOR_04="#fd971f" # COMMAND_COLOR2 -COLOR_05="#66d9ef" # PATH -COLOR_06="#9e6ffe" # SYNTAX_VAR -COLOR_07="#5e7175" # PROMP -COLOR_08="#ccccc6" # +export COLOR_01="#1b1d1e" # HOST +export COLOR_02="#f92672" # SYNTAX_STRING +export COLOR_03="#a6e22e" # COMMAND +export COLOR_04="#fd971f" # COMMAND_COLOR2 +export COLOR_05="#66d9ef" # PATH +export COLOR_06="#9e6ffe" # SYNTAX_VAR +export COLOR_07="#5e7175" # PROMP +export COLOR_08="#ccccc6" # -COLOR_09="#505354" # -COLOR_10="#ff669d" # COMMAND_ERROR -COLOR_11="#beed5f" # EXEC -COLOR_12="#e6db74" # -COLOR_13="#66d9ef" # FOLDER -COLOR_14="#9e6ffe" # -COLOR_15="#a3babf" # -COLOR_16="#f8f8f2" # +export COLOR_09="#505354" # +export COLOR_10="#ff669d" # COMMAND_ERROR +export COLOR_11="#beed5f" # EXEC +export COLOR_12="#e6db74" # +export COLOR_13="#66d9ef" # FOLDER +export COLOR_14="#9e6ffe" # +export COLOR_15="#a3babf" # +export COLOR_16="#f8f8f2" # -BACKGROUND_COLOR="#121212" # Background Color -FOREGROUND_COLOR="#a0a0a0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Hardcore" +export BACKGROUND_COLOR="#121212" # Background Color +export FOREGROUND_COLOR="#a0a0a0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Hardcore" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hardcore" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/harper.sh b/themes/harper.sh index b9252d6..cc2096d 100755 --- a/themes/harper.sh +++ b/themes/harper.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#010101" # HOST -COLOR_02="#f8b63f" # SYNTAX_STRING -COLOR_03="#7fb5e1" # COMMAND -COLOR_04="#d6da25" # COMMAND_COLOR2 -COLOR_05="#489e48" # PATH -COLOR_06="#b296c6" # SYNTAX_VAR -COLOR_07="#f5bfd7" # PROMP -COLOR_08="#a8a49d" # +export COLOR_01="#010101" # HOST +export COLOR_02="#f8b63f" # SYNTAX_STRING +export COLOR_03="#7fb5e1" # COMMAND +export COLOR_04="#d6da25" # COMMAND_COLOR2 +export COLOR_05="#489e48" # PATH +export COLOR_06="#b296c6" # SYNTAX_VAR +export COLOR_07="#f5bfd7" # PROMP +export COLOR_08="#a8a49d" # -COLOR_09="#726e6a" # -COLOR_10="#f8b63f" # COMMAND_ERROR -COLOR_11="#7fb5e1" # EXEC -COLOR_12="#d6da25" # -COLOR_13="#489e48" # FOLDER -COLOR_14="#b296c6" # -COLOR_15="#f5bfd7" # -COLOR_16="#fefbea" # +export COLOR_09="#726e6a" # +export COLOR_10="#f8b63f" # COMMAND_ERROR +export COLOR_11="#7fb5e1" # EXEC +export COLOR_12="#d6da25" # +export COLOR_13="#489e48" # FOLDER +export COLOR_14="#b296c6" # +export COLOR_15="#f5bfd7" # +export COLOR_16="#fefbea" # -BACKGROUND_COLOR="#010101" # Background Color -FOREGROUND_COLOR="#a8a49d" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Harper" +export BACKGROUND_COLOR="#010101" # Background Color +export FOREGROUND_COLOR="#a8a49d" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Harper" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Harper" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hemisu-dark.sh b/themes/hemisu-dark.sh index bc4cd57..e4ccd03 100755 --- a/themes/hemisu-dark.sh +++ b/themes/hemisu-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#444444" -COLOR_02="#FF0054" -COLOR_03="#B1D630" -COLOR_04="#9D895E" -COLOR_05="#67BEE3" -COLOR_06="#B576BC" -COLOR_07="#569A9F" -COLOR_08="#EDEDED" +export COLOR_01="#444444" +export COLOR_02="#FF0054" +export COLOR_03="#B1D630" +export COLOR_04="#9D895E" +export COLOR_05="#67BEE3" +export COLOR_06="#B576BC" +export COLOR_07="#569A9F" +export COLOR_08="#EDEDED" -COLOR_09="#777777" -COLOR_10="#D65E75" -COLOR_11="#BAFFAA" -COLOR_12="#ECE1C8" -COLOR_13="#9FD3E5" -COLOR_14="#DEB3DF" -COLOR_15="#B6E0E5" -COLOR_16="#FFFFFF" +export COLOR_09="#777777" +export COLOR_10="#D65E75" +export COLOR_11="#BAFFAA" +export COLOR_12="#ECE1C8" +export COLOR_13="#9FD3E5" +export COLOR_14="#DEB3DF" +export COLOR_15="#B6E0E5" +export COLOR_16="#FFFFFF" -BACKGROUND_COLOR="#000000" -FOREGROUND_COLOR="#FFFFFF" -CURSOR_COLOR="#BAFFAA" -PROFILE_NAME="Hemisu Dark" +export BACKGROUND_COLOR="#000000" +export FOREGROUND_COLOR="#FFFFFF" +export CURSOR_COLOR="#BAFFAA" +export PROFILE_NAME="Hemisu Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hemisu Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hemisu-light.sh b/themes/hemisu-light.sh index 350f4d9..150528b 100755 --- a/themes/hemisu-light.sh +++ b/themes/hemisu-light.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#777777" -COLOR_02="#FF0055" -COLOR_03="#739100" -COLOR_04="#503D15" -COLOR_05="#538091" -COLOR_06="#5B345E" -COLOR_07="#538091" -COLOR_08="#999999" +export COLOR_01="#777777" +export COLOR_02="#FF0055" +export COLOR_03="#739100" +export COLOR_04="#503D15" +export COLOR_05="#538091" +export COLOR_06="#5B345E" +export COLOR_07="#538091" +export COLOR_08="#999999" -COLOR_09="#999999" -COLOR_10="#D65E76" -COLOR_11="#9CC700" -COLOR_12="#947555" -COLOR_13="#9DB3CD" -COLOR_14="#A184A4" -COLOR_15="#85B2AA" -COLOR_16="#BABABA" +export COLOR_09="#999999" +export COLOR_10="#D65E76" +export COLOR_11="#9CC700" +export COLOR_12="#947555" +export COLOR_13="#9DB3CD" +export COLOR_14="#A184A4" +export COLOR_15="#85B2AA" +export COLOR_16="#BABABA" -BACKGROUND_COLOR="#EFEFEF" -FOREGROUND_COLOR="#444444" -CURSOR_COLOR="#FF0054" -PROFILE_NAME="Hemisu Light" +export BACKGROUND_COLOR="#EFEFEF" +export FOREGROUND_COLOR="#444444" +export CURSOR_COLOR="#FF0054" +export PROFILE_NAME="Hemisu Light" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hemisu Light" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/highway.sh b/themes/highway.sh index 841d58f..1378228 100755 --- a/themes/highway.sh +++ b/themes/highway.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#d00e18" # SYNTAX_STRING -COLOR_03="#138034" # COMMAND -COLOR_04="#ffcb3e" # COMMAND_COLOR2 -COLOR_05="#006bb3" # PATH -COLOR_06="#6b2775" # SYNTAX_VAR -COLOR_07="#384564" # PROMP -COLOR_08="#ededed" # +export COLOR_01="#000000" # HOST +export COLOR_02="#d00e18" # SYNTAX_STRING +export COLOR_03="#138034" # COMMAND +export COLOR_04="#ffcb3e" # COMMAND_COLOR2 +export COLOR_05="#006bb3" # PATH +export COLOR_06="#6b2775" # SYNTAX_VAR +export COLOR_07="#384564" # PROMP +export COLOR_08="#ededed" # -COLOR_09="#5d504a" # -COLOR_10="#f07e18" # COMMAND_ERROR -COLOR_11="#b1d130" # EXEC -COLOR_12="#fff120" # -COLOR_13="#4fc2fd" # FOLDER -COLOR_14="#de0071" # -COLOR_15="#5d504a" # -COLOR_16="#ffffff" # +export COLOR_09="#5d504a" # +export COLOR_10="#f07e18" # COMMAND_ERROR +export COLOR_11="#b1d130" # EXEC +export COLOR_12="#fff120" # +export COLOR_13="#4fc2fd" # FOLDER +export COLOR_14="#de0071" # +export COLOR_15="#5d504a" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#222225" # Background Color -FOREGROUND_COLOR="#ededed" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Highway" +export BACKGROUND_COLOR="#222225" # Background Color +export FOREGROUND_COLOR="#ededed" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Highway" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Highway" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hipster-green.sh b/themes/hipster-green.sh index f663361..02c0fae 100755 --- a/themes/hipster-green.sh +++ b/themes/hipster-green.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b6214a" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#bfbf00" # COMMAND_COLOR2 -COLOR_05="#246eb2" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b6214a" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#bfbf00" # COMMAND_COLOR2 +export COLOR_05="#246eb2" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#86a93e" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#86a93e" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#100b05" # Background Color -FOREGROUND_COLOR="#84c138" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Hipster Green" +export BACKGROUND_COLOR="#100b05" # Background Color +export FOREGROUND_COLOR="#84c138" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Hipster Green" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hipster Green" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/homebrew.sh b/themes/homebrew.sh index 511c5fd..8f1e657 100755 --- a/themes/homebrew.sh +++ b/themes/homebrew.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#990000" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#999900" # COMMAND_COLOR2 -COLOR_05="#0000b2" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#990000" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#999900" # COMMAND_COLOR2 +export COLOR_05="#0000b2" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#00d900" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#00d900" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#00ff00" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Homebrew" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#00ff00" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Homebrew" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Homebrew" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hurtado.sh b/themes/hurtado.sh index ce261f8..7a90479 100755 --- a/themes/hurtado.sh +++ b/themes/hurtado.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#575757" # HOST -COLOR_02="#ff1b00" # SYNTAX_STRING -COLOR_03="#a5e055" # COMMAND -COLOR_04="#fbe74a" # COMMAND_COLOR2 -COLOR_05="#496487" # PATH -COLOR_06="#fd5ff1" # SYNTAX_VAR -COLOR_07="#86e9fe" # PROMP -COLOR_08="#cbcccb" # +export COLOR_01="#575757" # HOST +export COLOR_02="#ff1b00" # SYNTAX_STRING +export COLOR_03="#a5e055" # COMMAND +export COLOR_04="#fbe74a" # COMMAND_COLOR2 +export COLOR_05="#496487" # PATH +export COLOR_06="#fd5ff1" # SYNTAX_VAR +export COLOR_07="#86e9fe" # PROMP +export COLOR_08="#cbcccb" # -COLOR_09="#262626" # -COLOR_10="#d51d00" # COMMAND_ERROR -COLOR_11="#a5df55" # EXEC -COLOR_12="#fbe84a" # -COLOR_13="#89beff" # FOLDER -COLOR_14="#c001c1" # -COLOR_15="#86eafe" # -COLOR_16="#dbdbdb" # +export COLOR_09="#262626" # +export COLOR_10="#d51d00" # COMMAND_ERROR +export COLOR_11="#a5df55" # EXEC +export COLOR_12="#fbe84a" # +export COLOR_13="#89beff" # FOLDER +export COLOR_14="#c001c1" # +export COLOR_15="#86eafe" # +export COLOR_16="#dbdbdb" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#dbdbdb" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Hurtado" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#dbdbdb" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Hurtado" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hurtado" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/hybrid.sh b/themes/hybrid.sh index 02dd313..3a8c241 100755 --- a/themes/hybrid.sh +++ b/themes/hybrid.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#282a2e" # HOST -COLOR_02="#A54242" # SYNTAX_STRING -COLOR_03="#8C9440" # COMMAND -COLOR_04="#de935f" # COMMAND_COLOR2 -COLOR_05="#5F819D" # PATH -COLOR_06="#85678F" # SYNTAX_VAR -COLOR_07="#5E8D87" # PROMP -COLOR_08="#969896" # +export COLOR_01="#282a2e" # HOST +export COLOR_02="#A54242" # SYNTAX_STRING +export COLOR_03="#8C9440" # COMMAND +export COLOR_04="#de935f" # COMMAND_COLOR2 +export COLOR_05="#5F819D" # PATH +export COLOR_06="#85678F" # SYNTAX_VAR +export COLOR_07="#5E8D87" # PROMP +export COLOR_08="#969896" # -COLOR_09="#373b41" # -COLOR_10="#cc6666" # COMMAND_ERROR -COLOR_11="#b5bd68" # EXEC -COLOR_12="#f0c674" # -COLOR_13="#81a2be" # FOLDER -COLOR_14="#b294bb" # -COLOR_15="#8abeb7" # -COLOR_16="#c5c8c6" # +export COLOR_09="#373b41" # +export COLOR_10="#cc6666" # COMMAND_ERROR +export COLOR_11="#b5bd68" # EXEC +export COLOR_12="#f0c674" # +export COLOR_13="#81a2be" # FOLDER +export COLOR_14="#b294bb" # +export COLOR_15="#8abeb7" # +export COLOR_16="#c5c8c6" # -BACKGROUND_COLOR="#141414" # Background Color -FOREGROUND_COLOR="#94a3a5" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Hybrid" +export BACKGROUND_COLOR="#141414" # Background Color +export FOREGROUND_COLOR="#94a3a5" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Hybrid" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Hybrid" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ic-green-ppl.sh b/themes/ic-green-ppl.sh index bb21a1b..3f551d7 100755 --- a/themes/ic-green-ppl.sh +++ b/themes/ic-green-ppl.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1f1f1f" # HOST -COLOR_02="#fb002a" # SYNTAX_STRING -COLOR_03="#339c24" # COMMAND -COLOR_04="#659b25" # COMMAND_COLOR2 -COLOR_05="#149b45" # PATH -COLOR_06="#53b82c" # SYNTAX_VAR -COLOR_07="#2cb868" # PROMP -COLOR_08="#e0ffef" # +export COLOR_01="#1f1f1f" # HOST +export COLOR_02="#fb002a" # SYNTAX_STRING +export COLOR_03="#339c24" # COMMAND +export COLOR_04="#659b25" # COMMAND_COLOR2 +export COLOR_05="#149b45" # PATH +export COLOR_06="#53b82c" # SYNTAX_VAR +export COLOR_07="#2cb868" # PROMP +export COLOR_08="#e0ffef" # -COLOR_09="#032710" # -COLOR_10="#a7ff3f" # COMMAND_ERROR -COLOR_11="#9fff6d" # EXEC -COLOR_12="#d2ff6d" # -COLOR_13="#72ffb5" # FOLDER -COLOR_14="#50ff3e" # -COLOR_15="#22ff71" # -COLOR_16="#daefd0" # +export COLOR_09="#032710" # +export COLOR_10="#a7ff3f" # COMMAND_ERROR +export COLOR_11="#9fff6d" # EXEC +export COLOR_12="#d2ff6d" # +export COLOR_13="#72ffb5" # FOLDER +export COLOR_14="#50ff3e" # +export COLOR_15="#22ff71" # +export COLOR_16="#daefd0" # -BACKGROUND_COLOR="#3a3d3f" # Background Color -FOREGROUND_COLOR="#d9efd3" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="IC Green PPL" +export BACKGROUND_COLOR="#3a3d3f" # Background Color +export FOREGROUND_COLOR="#d9efd3" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="IC Green PPL" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="IC Green PPL" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ic-orange-ppl.sh b/themes/ic-orange-ppl.sh index 5fb4149..8bb4994 100755 --- a/themes/ic-orange-ppl.sh +++ b/themes/ic-orange-ppl.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#c13900" # SYNTAX_STRING -COLOR_03="#a4a900" # COMMAND -COLOR_04="#caaf00" # COMMAND_COLOR2 -COLOR_05="#bd6d00" # PATH -COLOR_06="#fc5e00" # SYNTAX_VAR -COLOR_07="#f79500" # PROMP -COLOR_08="#ffc88a" # +export COLOR_01="#000000" # HOST +export COLOR_02="#c13900" # SYNTAX_STRING +export COLOR_03="#a4a900" # COMMAND +export COLOR_04="#caaf00" # COMMAND_COLOR2 +export COLOR_05="#bd6d00" # PATH +export COLOR_06="#fc5e00" # SYNTAX_VAR +export COLOR_07="#f79500" # PROMP +export COLOR_08="#ffc88a" # -COLOR_09="#6a4f2a" # -COLOR_10="#ff8c68" # COMMAND_ERROR -COLOR_11="#f6ff40" # EXEC -COLOR_12="#ffe36e" # -COLOR_13="#ffbe55" # FOLDER -COLOR_14="#fc874f" # -COLOR_15="#c69752" # -COLOR_16="#fafaff" # +export COLOR_09="#6a4f2a" # +export COLOR_10="#ff8c68" # COMMAND_ERROR +export COLOR_11="#f6ff40" # EXEC +export COLOR_12="#ffe36e" # +export COLOR_13="#ffbe55" # FOLDER +export COLOR_14="#fc874f" # +export COLOR_15="#c69752" # +export COLOR_16="#fafaff" # -BACKGROUND_COLOR="#262626" # Background Color -FOREGROUND_COLOR="#ffcb83" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="IC Orange PPL" +export BACKGROUND_COLOR="#262626" # Background Color +export FOREGROUND_COLOR="#ffcb83" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="IC Orange PPL" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="IC Orange PPL" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/idle-toes.sh b/themes/idle-toes.sh index ff7b085..08587a9 100755 --- a/themes/idle-toes.sh +++ b/themes/idle-toes.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#323232" # HOST -COLOR_02="#d25252" # SYNTAX_STRING -COLOR_03="#7fe173" # COMMAND -COLOR_04="#ffc66d" # COMMAND_COLOR2 -COLOR_05="#4099ff" # PATH -COLOR_06="#f680ff" # SYNTAX_VAR -COLOR_07="#bed6ff" # PROMP -COLOR_08="#eeeeec" # +export COLOR_01="#323232" # HOST +export COLOR_02="#d25252" # SYNTAX_STRING +export COLOR_03="#7fe173" # COMMAND +export COLOR_04="#ffc66d" # COMMAND_COLOR2 +export COLOR_05="#4099ff" # PATH +export COLOR_06="#f680ff" # SYNTAX_VAR +export COLOR_07="#bed6ff" # PROMP +export COLOR_08="#eeeeec" # -COLOR_09="#535353" # -COLOR_10="#f07070" # COMMAND_ERROR -COLOR_11="#9dff91" # EXEC -COLOR_12="#ffe48b" # -COLOR_13="#5eb7f7" # FOLDER -COLOR_14="#ff9dff" # -COLOR_15="#dcf4ff" # -COLOR_16="#ffffff" # +export COLOR_09="#535353" # +export COLOR_10="#f07070" # COMMAND_ERROR +export COLOR_11="#9dff91" # EXEC +export COLOR_12="#ffe48b" # +export COLOR_13="#5eb7f7" # FOLDER +export COLOR_14="#ff9dff" # +export COLOR_15="#dcf4ff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#323232" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Idle Toes" +export BACKGROUND_COLOR="#323232" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Idle Toes" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Idle Toes" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ir-black.sh b/themes/ir-black.sh index 08ffebe..55de9a1 100755 --- a/themes/ir-black.sh +++ b/themes/ir-black.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4e4e4e" # HOST -COLOR_02="#ff6c60" # SYNTAX_STRING -COLOR_03="#a8ff60" # COMMAND -COLOR_04="#ffffb6" # COMMAND_COLOR2 -COLOR_05="#69cbfe" # PATH -COLOR_06="#ff73Fd" # SYNTAX_VAR -COLOR_07="#c6c5fe" # PROMP -COLOR_08="#eeeeee" # +export COLOR_01="#4e4e4e" # HOST +export COLOR_02="#ff6c60" # SYNTAX_STRING +export COLOR_03="#a8ff60" # COMMAND +export COLOR_04="#ffffb6" # COMMAND_COLOR2 +export COLOR_05="#69cbfe" # PATH +export COLOR_06="#ff73Fd" # SYNTAX_VAR +export COLOR_07="#c6c5fe" # PROMP +export COLOR_08="#eeeeee" # -COLOR_09="#7c7c7c" # -COLOR_10="#ffb6b0" # COMMAND_ERROR -COLOR_11="#ceffac" # EXEC -COLOR_12="#ffffcb" # -COLOR_13="#b5dcfe" # FOLDER -COLOR_14="#ff9cfe" # -COLOR_15="#dfdffe" # -COLOR_16="#ffffff" # +export COLOR_09="#7c7c7c" # +export COLOR_10="#ffb6b0" # COMMAND_ERROR +export COLOR_11="#ceffac" # EXEC +export COLOR_12="#ffffcb" # +export COLOR_13="#b5dcfe" # FOLDER +export COLOR_14="#ff9cfe" # +export COLOR_15="#dfdffe" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#eeeeee" # Text -CURSOR_COLOR="ffa560" # Cursor -PROFILE_NAME="Ir Black" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#eeeeee" # Text +export CURSOR_COLOR="ffa560" # Cursor +export PROFILE_NAME="Ir Black" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="Ir Black" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/jackie-brown.sh b/themes/jackie-brown.sh index 058001d..1d21426 100755 --- a/themes/jackie-brown.sh +++ b/themes/jackie-brown.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2c1d16" # HOST -COLOR_02="#ef5734" # SYNTAX_STRING -COLOR_03="#2baf2b" # COMMAND -COLOR_04="#bebf00" # COMMAND_COLOR2 -COLOR_05="#246eb2" # PATH -COLOR_06="#d05ec1" # SYNTAX_VAR -COLOR_07="#00acee" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#2c1d16" # HOST +export COLOR_02="#ef5734" # SYNTAX_STRING +export COLOR_03="#2baf2b" # COMMAND +export COLOR_04="#bebf00" # COMMAND_COLOR2 +export COLOR_05="#246eb2" # PATH +export COLOR_06="#d05ec1" # SYNTAX_VAR +export COLOR_07="#00acee" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#86a93e" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#86a93e" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#2c1d16" # Background Color -FOREGROUND_COLOR="#ffcc2f" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Jackie Brown" +export BACKGROUND_COLOR="#2c1d16" # Background Color +export FOREGROUND_COLOR="#ffcc2f" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Jackie Brown" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Jackie Brown" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/japanesque.sh b/themes/japanesque.sh index d79e034..56357de 100755 --- a/themes/japanesque.sh +++ b/themes/japanesque.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#343935" # HOST -COLOR_02="#cf3f61" # SYNTAX_STRING -COLOR_03="#7bb75b" # COMMAND -COLOR_04="#e9b32a" # COMMAND_COLOR2 -COLOR_05="#4c9ad4" # PATH -COLOR_06="#a57fc4" # SYNTAX_VAR -COLOR_07="#389aad" # PROMP -COLOR_08="#fafaf6" # +export COLOR_01="#343935" # HOST +export COLOR_02="#cf3f61" # SYNTAX_STRING +export COLOR_03="#7bb75b" # COMMAND +export COLOR_04="#e9b32a" # COMMAND_COLOR2 +export COLOR_05="#4c9ad4" # PATH +export COLOR_06="#a57fc4" # SYNTAX_VAR +export COLOR_07="#389aad" # PROMP +export COLOR_08="#fafaf6" # -COLOR_09="#595b59" # -COLOR_10="#d18fa6" # COMMAND_ERROR -COLOR_11="#767f2c" # EXEC -COLOR_12="#78592f" # -COLOR_13="#135979" # FOLDER -COLOR_14="#604291" # -COLOR_15="#76bbca" # -COLOR_16="#b2b5ae" # +export COLOR_09="#595b59" # +export COLOR_10="#d18fa6" # COMMAND_ERROR +export COLOR_11="#767f2c" # EXEC +export COLOR_12="#78592f" # +export COLOR_13="#135979" # FOLDER +export COLOR_14="#604291" # +export COLOR_15="#76bbca" # +export COLOR_16="#b2b5ae" # -BACKGROUND_COLOR="#1e1e1e" # Background Color -FOREGROUND_COLOR="#f7f6ec" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Japanesque" +export BACKGROUND_COLOR="#1e1e1e" # Background Color +export FOREGROUND_COLOR="#f7f6ec" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Japanesque" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Japanesque" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/jellybeans.sh b/themes/jellybeans.sh index ce07c87..20e38bd 100755 --- a/themes/jellybeans.sh +++ b/themes/jellybeans.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#929292" # HOST -COLOR_02="#e27373" # SYNTAX_STRING -COLOR_03="#94b979" # COMMAND -COLOR_04="#ffba7b" # COMMAND_COLOR2 -COLOR_05="#97bedc" # PATH -COLOR_06="#e1c0fa" # SYNTAX_VAR -COLOR_07="#00988e" # PROMP -COLOR_08="#dedede" # +export COLOR_01="#929292" # HOST +export COLOR_02="#e27373" # SYNTAX_STRING +export COLOR_03="#94b979" # COMMAND +export COLOR_04="#ffba7b" # COMMAND_COLOR2 +export COLOR_05="#97bedc" # PATH +export COLOR_06="#e1c0fa" # SYNTAX_VAR +export COLOR_07="#00988e" # PROMP +export COLOR_08="#dedede" # -COLOR_09="#bdbdbd" # -COLOR_10="#ffa1a1" # COMMAND_ERROR -COLOR_11="#bddeab" # EXEC -COLOR_12="#ffdca0" # -COLOR_13="#b1d8f6" # FOLDER -COLOR_14="#fbdaff" # -COLOR_15="#1ab2a8" # -COLOR_16="#ffffff" # +export COLOR_09="#bdbdbd" # +export COLOR_10="#ffa1a1" # COMMAND_ERROR +export COLOR_11="#bddeab" # EXEC +export COLOR_12="#ffdca0" # +export COLOR_13="#b1d8f6" # FOLDER +export COLOR_14="#fbdaff" # +export COLOR_15="#1ab2a8" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#121212" # Background Color -FOREGROUND_COLOR="#dedede" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Jellybeans" +export BACKGROUND_COLOR="#121212" # Background Color +export FOREGROUND_COLOR="#dedede" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Jellybeans" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Jellybeans" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/jup.sh b/themes/jup.sh index 6ef9f60..2864215 100755 --- a/themes/jup.sh +++ b/themes/jup.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#dd006f" # SYNTAX_STRING -COLOR_03="#6fdd00" # COMMAND -COLOR_04="#dd6f00" # COMMAND_COLOR2 -COLOR_05="#006fdd" # PATH -COLOR_06="#6f00dd" # SYNTAX_VAR -COLOR_07="#00dd6f" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#000000" # HOST +export COLOR_02="#dd006f" # SYNTAX_STRING +export COLOR_03="#6fdd00" # COMMAND +export COLOR_04="#dd6f00" # COMMAND_COLOR2 +export COLOR_05="#006fdd" # PATH +export COLOR_06="#6f00dd" # SYNTAX_VAR +export COLOR_07="#00dd6f" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#7d7d7d" # -COLOR_10="#ff74b9" # COMMAND_ERROR -COLOR_11="#b9ff74" # EXEC -COLOR_12="#ffb974" # -COLOR_13="#74b9ff" # FOLDER -COLOR_14="#b974ff" # -COLOR_15="#74ffb9" # -COLOR_16="#ffffff" # +export COLOR_09="#7d7d7d" # +export COLOR_10="#ff74b9" # COMMAND_ERROR +export COLOR_11="#b9ff74" # EXEC +export COLOR_12="#ffb974" # +export COLOR_13="#74b9ff" # FOLDER +export COLOR_14="#b974ff" # +export COLOR_15="#74ffb9" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#758480" # Background Color -FOREGROUND_COLOR="#23476a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Jup" +export BACKGROUND_COLOR="#758480" # Background Color +export FOREGROUND_COLOR="#23476a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Jup" # ===================== END CONFIG ======================================= # @@ -34,22 +34,21 @@ PROFILE_NAME="Jup" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/kibble.sh b/themes/kibble.sh index 1e6875b..32e040d 100755 --- a/themes/kibble.sh +++ b/themes/kibble.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4d4d4d" # HOST -COLOR_02="#c70031" # SYNTAX_STRING -COLOR_03="#29cf13" # COMMAND -COLOR_04="#d8e30e" # COMMAND_COLOR2 -COLOR_05="#3449d1" # PATH -COLOR_06="#8400ff" # SYNTAX_VAR -COLOR_07="#0798ab" # PROMP -COLOR_08="#e2d1e3" # +export COLOR_01="#4d4d4d" # HOST +export COLOR_02="#c70031" # SYNTAX_STRING +export COLOR_03="#29cf13" # COMMAND +export COLOR_04="#d8e30e" # COMMAND_COLOR2 +export COLOR_05="#3449d1" # PATH +export COLOR_06="#8400ff" # SYNTAX_VAR +export COLOR_07="#0798ab" # PROMP +export COLOR_08="#e2d1e3" # -COLOR_09="#5a5a5a" # -COLOR_10="#f01578" # COMMAND_ERROR -COLOR_11="#6ce05c" # EXEC -COLOR_12="#f3f79e" # -COLOR_13="#97a4f7" # FOLDER -COLOR_14="#c495f0" # -COLOR_15="#68f2e0" # -COLOR_16="#ffffff" # +export COLOR_09="#5a5a5a" # +export COLOR_10="#f01578" # COMMAND_ERROR +export COLOR_11="#6ce05c" # EXEC +export COLOR_12="#f3f79e" # +export COLOR_13="#97a4f7" # FOLDER +export COLOR_14="#c495f0" # +export COLOR_15="#68f2e0" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0e100a" # Background Color -FOREGROUND_COLOR="#f7f7f7" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Kibble" +export BACKGROUND_COLOR="#0e100a" # Background Color +export FOREGROUND_COLOR="#f7f7f7" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Kibble" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Kibble" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/later-this-evening.sh b/themes/later-this-evening.sh index 3c09484..a119419 100755 --- a/themes/later-this-evening.sh +++ b/themes/later-this-evening.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2b2b2b" # HOST -COLOR_02="#d45a60" # SYNTAX_STRING -COLOR_03="#afba67" # COMMAND -COLOR_04="#e5d289" # COMMAND_COLOR2 -COLOR_05="#a0bad6" # PATH -COLOR_06="#c092d6" # SYNTAX_VAR -COLOR_07="#91bfb7" # PROMP -COLOR_08="#3c3d3d" # +export COLOR_01="#2b2b2b" # HOST +export COLOR_02="#d45a60" # SYNTAX_STRING +export COLOR_03="#afba67" # COMMAND +export COLOR_04="#e5d289" # COMMAND_COLOR2 +export COLOR_05="#a0bad6" # PATH +export COLOR_06="#c092d6" # SYNTAX_VAR +export COLOR_07="#91bfb7" # PROMP +export COLOR_08="#3c3d3d" # -COLOR_09="#454747" # -COLOR_10="#d3232f" # COMMAND_ERROR -COLOR_11="#aabb39" # EXEC -COLOR_12="#e5be39" # -COLOR_13="#6699d6" # FOLDER -COLOR_14="#ab53d6" # -COLOR_15="#5fc0ae" # -COLOR_16="#c1c2c2" # +export COLOR_09="#454747" # +export COLOR_10="#d3232f" # COMMAND_ERROR +export COLOR_11="#aabb39" # EXEC +export COLOR_12="#e5be39" # +export COLOR_13="#6699d6" # FOLDER +export COLOR_14="#ab53d6" # +export COLOR_15="#5fc0ae" # +export COLOR_16="#c1c2c2" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#959595" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Later This Evening" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#959595" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Later This Evening" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Later This Evening" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/lavandula.sh b/themes/lavandula.sh index be45550..1a0e98d 100755 --- a/themes/lavandula.sh +++ b/themes/lavandula.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#230046" # HOST -COLOR_02="#7d1625" # SYNTAX_STRING -COLOR_03="#337e6f" # COMMAND -COLOR_04="#7f6f49" # COMMAND_COLOR2 -COLOR_05="#4f4a7f" # PATH -COLOR_06="#5a3f7f" # SYNTAX_VAR -COLOR_07="#58777f" # PROMP -COLOR_08="#736e7d" # +export COLOR_01="#230046" # HOST +export COLOR_02="#7d1625" # SYNTAX_STRING +export COLOR_03="#337e6f" # COMMAND +export COLOR_04="#7f6f49" # COMMAND_COLOR2 +export COLOR_05="#4f4a7f" # PATH +export COLOR_06="#5a3f7f" # SYNTAX_VAR +export COLOR_07="#58777f" # PROMP +export COLOR_08="#736e7d" # -COLOR_09="#372d46" # -COLOR_10="#e05167" # COMMAND_ERROR -COLOR_11="#52e0c4" # EXEC -COLOR_12="#e0c386" # -COLOR_13="#8e87e0" # FOLDER -COLOR_14="#a776e0" # -COLOR_15="#9ad4e0" # -COLOR_16="#8c91fa" # +export COLOR_09="#372d46" # +export COLOR_10="#e05167" # COMMAND_ERROR +export COLOR_11="#52e0c4" # EXEC +export COLOR_12="#e0c386" # +export COLOR_13="#8e87e0" # FOLDER +export COLOR_14="#a776e0" # +export COLOR_15="#9ad4e0" # +export COLOR_16="#8c91fa" # -BACKGROUND_COLOR="#050014" # Background Color -FOREGROUND_COLOR="#736e7d" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Lavandula" +export BACKGROUND_COLOR="#050014" # Background Color +export FOREGROUND_COLOR="#736e7d" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Lavandula" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Lavandula" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/liquid-carbon-transparent.sh b/themes/liquid-carbon-transparent.sh index bf0cab0..fd87922 100755 --- a/themes/liquid-carbon-transparent.sh +++ b/themes/liquid-carbon-transparent.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff3030" # SYNTAX_STRING -COLOR_03="#559a70" # COMMAND -COLOR_04="#ccac00" # COMMAND_COLOR2 -COLOR_05="#0099cc" # PATH -COLOR_06="#cc69c8" # SYNTAX_VAR -COLOR_07="#7ac4cc" # PROMP -COLOR_08="#bccccc" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff3030" # SYNTAX_STRING +export COLOR_03="#559a70" # COMMAND +export COLOR_04="#ccac00" # COMMAND_COLOR2 +export COLOR_05="#0099cc" # PATH +export COLOR_06="#cc69c8" # SYNTAX_VAR +export COLOR_07="#7ac4cc" # PROMP +export COLOR_08="#bccccc" # -COLOR_09="#000000" # -COLOR_10="#ff3030" # COMMAND_ERROR -COLOR_11="#559a70" # EXEC -COLOR_12="#ccac00" # -COLOR_13="#0099cc" # FOLDER -COLOR_14="#cc69c8" # -COLOR_15="#7ac4cc" # -COLOR_16="#bccccc" # +export COLOR_09="#000000" # +export COLOR_10="#ff3030" # COMMAND_ERROR +export COLOR_11="#559a70" # EXEC +export COLOR_12="#ccac00" # +export COLOR_13="#0099cc" # FOLDER +export COLOR_14="#cc69c8" # +export COLOR_15="#7ac4cc" # +export COLOR_16="#bccccc" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#afc2c2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Liquid Carbon Transparent" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#afc2c2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Liquid Carbon Transparent" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Liquid Carbon Transparent" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/liquid-carbon.sh b/themes/liquid-carbon.sh index 6a188f2..51ac98f 100755 --- a/themes/liquid-carbon.sh +++ b/themes/liquid-carbon.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff3030" # SYNTAX_STRING -COLOR_03="#559a70" # COMMAND -COLOR_04="#ccac00" # COMMAND_COLOR2 -COLOR_05="#0099cc" # PATH -COLOR_06="#cc69c8" # SYNTAX_VAR -COLOR_07="#7ac4cc" # PROMP -COLOR_08="#bccccc" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff3030" # SYNTAX_STRING +export COLOR_03="#559a70" # COMMAND +export COLOR_04="#ccac00" # COMMAND_COLOR2 +export COLOR_05="#0099cc" # PATH +export COLOR_06="#cc69c8" # SYNTAX_VAR +export COLOR_07="#7ac4cc" # PROMP +export COLOR_08="#bccccc" # -COLOR_09="#000000" # -COLOR_10="#ff3030" # COMMAND_ERROR -COLOR_11="#559a70" # EXEC -COLOR_12="#ccac00" # -COLOR_13="#0099cc" # FOLDER -COLOR_14="#cc69c8" # -COLOR_15="#7ac4cc" # -COLOR_16="#bccccc" # +export COLOR_09="#000000" # +export COLOR_10="#ff3030" # COMMAND_ERROR +export COLOR_11="#559a70" # EXEC +export COLOR_12="#ccac00" # +export COLOR_13="#0099cc" # FOLDER +export COLOR_14="#cc69c8" # +export COLOR_15="#7ac4cc" # +export COLOR_16="#bccccc" # -BACKGROUND_COLOR="#303030" # Background Color -FOREGROUND_COLOR="#afc2c2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Liquid Carbon" +export BACKGROUND_COLOR="#303030" # Background Color +export FOREGROUND_COLOR="#afc2c2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Liquid Carbon" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Liquid Carbon" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/man-page.sh b/themes/man-page.sh index 2f6985d..418dd2f 100755 --- a/themes/man-page.sh +++ b/themes/man-page.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#cc0000" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#999900" # COMMAND_COLOR2 -COLOR_05="#0000b2" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#cccccc" # +export COLOR_01="#000000" # HOST +export COLOR_02="#cc0000" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#999900" # COMMAND_COLOR2 +export COLOR_05="#0000b2" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#cccccc" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#00d900" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#00d900" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#fef49c" # Background Color -FOREGROUND_COLOR="#000000" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Man Page" +export BACKGROUND_COLOR="#fef49c" # Background Color +export FOREGROUND_COLOR="#000000" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Man Page" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Man Page" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/mar.sh b/themes/mar.sh index 1c66251..9291d76 100755 --- a/themes/mar.sh +++ b/themes/mar.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b5407b" # SYNTAX_STRING -COLOR_03="#7bb540" # COMMAND -COLOR_04="#b57b40" # COMMAND_COLOR2 -COLOR_05="#407bb5" # PATH -COLOR_06="#7b40b5" # SYNTAX_VAR -COLOR_07="#40b57b" # PROMP -COLOR_08="#f8f8f8" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b5407b" # SYNTAX_STRING +export COLOR_03="#7bb540" # COMMAND +export COLOR_04="#b57b40" # COMMAND_COLOR2 +export COLOR_05="#407bb5" # PATH +export COLOR_06="#7b40b5" # SYNTAX_VAR +export COLOR_07="#40b57b" # PROMP +export COLOR_08="#f8f8f8" # -COLOR_09="#737373" # -COLOR_10="#cd73a0" # COMMAND_ERROR -COLOR_11="#a0cd73" # EXEC -COLOR_12="#cda073" # -COLOR_13="#73a0cd" # FOLDER -COLOR_14="#a073cd" # -COLOR_15="#73cda0" # -COLOR_16="#ffffff" # +export COLOR_09="#737373" # +export COLOR_10="#cd73a0" # COMMAND_ERROR +export COLOR_11="#a0cd73" # EXEC +export COLOR_12="#cda073" # +export COLOR_13="#73a0cd" # FOLDER +export COLOR_14="#a073cd" # +export COLOR_15="#73cda0" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#ffffff" # Background Color -FOREGROUND_COLOR="#23476a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Mar" +export BACKGROUND_COLOR="#ffffff" # Background Color +export FOREGROUND_COLOR="#23476a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Mar" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Mar" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/material.sh b/themes/material.sh index 6a5f3e9..b852399 100755 --- a/themes/material.sh +++ b/themes/material.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#073641" -COLOR_02="#EB606B" -COLOR_03="#C3E88D" -COLOR_04="#F7EB95" -COLOR_05="#80CBC3" -COLOR_06="#FF2490" -COLOR_07="#AEDDFF" -COLOR_08="#FFFFFF" +export COLOR_01="#073641" +export COLOR_02="#EB606B" +export COLOR_03="#C3E88D" +export COLOR_04="#F7EB95" +export COLOR_05="#80CBC3" +export COLOR_06="#FF2490" +export COLOR_07="#AEDDFF" +export COLOR_08="#FFFFFF" -COLOR_09="#002B36" -COLOR_10="#EB606B" -COLOR_11="#C3E88D" -COLOR_12="#F7EB95" -COLOR_13="#7DC6BF" -COLOR_14="#6C71C3" -COLOR_15="#34434D" -COLOR_16="#FFFFFF" +export COLOR_09="#002B36" +export COLOR_10="#EB606B" +export COLOR_11="#C3E88D" +export COLOR_12="#F7EB95" +export COLOR_13="#7DC6BF" +export COLOR_14="#6C71C3" +export COLOR_15="#34434D" +export COLOR_16="#FFFFFF" -BACKGROUND_COLOR="#1E282C" -FOREGROUND_COLOR="#C3C7D1" -CURSOR_COLOR="#657B83" -PROFILE_NAME="Material" +export BACKGROUND_COLOR="#1E282C" +export FOREGROUND_COLOR="#C3C7D1" +export CURSOR_COLOR="#657B83" +export PROFILE_NAME="Material" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Material" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/mathias.sh b/themes/mathias.sh index 9b3c87e..0327ab8 100755 --- a/themes/mathias.sh +++ b/themes/mathias.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#e52222" # SYNTAX_STRING -COLOR_03="#a6e32d" # COMMAND -COLOR_04="#fc951e" # COMMAND_COLOR2 -COLOR_05="#c48dff" # PATH -COLOR_06="#fa2573" # SYNTAX_VAR -COLOR_07="#67d9f0" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#000000" # HOST +export COLOR_02="#e52222" # SYNTAX_STRING +export COLOR_03="#a6e32d" # COMMAND +export COLOR_04="#fc951e" # COMMAND_COLOR2 +export COLOR_05="#c48dff" # PATH +export COLOR_06="#fa2573" # SYNTAX_VAR +export COLOR_07="#67d9f0" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#55ff55" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#55ff55" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#bbbbbb" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Mathias" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#bbbbbb" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Mathias" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Mathias" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/medallion.sh b/themes/medallion.sh index af9dd60..ed6ff04 100755 --- a/themes/medallion.sh +++ b/themes/medallion.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b64c00" # SYNTAX_STRING -COLOR_03="#7c8b16" # COMMAND -COLOR_04="#d3bd26" # COMMAND_COLOR2 -COLOR_05="#616bb0" # PATH -COLOR_06="#8c5a90" # SYNTAX_VAR -COLOR_07="#916c25" # PROMP -COLOR_08="#cac29a" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b64c00" # SYNTAX_STRING +export COLOR_03="#7c8b16" # COMMAND +export COLOR_04="#d3bd26" # COMMAND_COLOR2 +export COLOR_05="#616bb0" # PATH +export COLOR_06="#8c5a90" # SYNTAX_VAR +export COLOR_07="#916c25" # PROMP +export COLOR_08="#cac29a" # -COLOR_09="#5e5219" # -COLOR_10="#ff9149" # COMMAND_ERROR -COLOR_11="#b2ca3b" # EXEC -COLOR_12="#ffe54a" # -COLOR_13="#acb8ff" # FOLDER -COLOR_14="#ffa0ff" # -COLOR_15="#ffbc51" # -COLOR_16="#fed698" # +export COLOR_09="#5e5219" # +export COLOR_10="#ff9149" # COMMAND_ERROR +export COLOR_11="#b2ca3b" # EXEC +export COLOR_12="#ffe54a" # +export COLOR_13="#acb8ff" # FOLDER +export COLOR_14="#ffa0ff" # +export COLOR_15="#ffbc51" # +export COLOR_16="#fed698" # -BACKGROUND_COLOR="#1d1908" # Background Color -FOREGROUND_COLOR="#cac296" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Medallion" +export BACKGROUND_COLOR="#1d1908" # Background Color +export FOREGROUND_COLOR="#cac296" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Medallion" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Medallion" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/misterioso.sh b/themes/misterioso.sh index c904d5a..a171252 100755 --- a/themes/misterioso.sh +++ b/themes/misterioso.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff4242" # SYNTAX_STRING -COLOR_03="#74af68" # COMMAND -COLOR_04="#ffad29" # COMMAND_COLOR2 -COLOR_05="#338f86" # PATH -COLOR_06="#9414e6" # SYNTAX_VAR -COLOR_07="#23d7d7" # PROMP -COLOR_08="#e1e1e0" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff4242" # SYNTAX_STRING +export COLOR_03="#74af68" # COMMAND +export COLOR_04="#ffad29" # COMMAND_COLOR2 +export COLOR_05="#338f86" # PATH +export COLOR_06="#9414e6" # SYNTAX_VAR +export COLOR_07="#23d7d7" # PROMP +export COLOR_08="#e1e1e0" # -COLOR_09="#555555" # -COLOR_10="#ff3242" # COMMAND_ERROR -COLOR_11="#74cd68" # EXEC -COLOR_12="#ffb929" # -COLOR_13="#23d7d7" # FOLDER -COLOR_14="#ff37ff" # -COLOR_15="#00ede1" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff3242" # COMMAND_ERROR +export COLOR_11="#74cd68" # EXEC +export COLOR_12="#ffb929" # +export COLOR_13="#23d7d7" # FOLDER +export COLOR_14="#ff37ff" # +export COLOR_15="#00ede1" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#2d3743" # Background Color -FOREGROUND_COLOR="#e1e1e0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Misterioso" +export BACKGROUND_COLOR="#2d3743" # Background Color +export FOREGROUND_COLOR="#e1e1e0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Misterioso" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Misterioso" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/miu.sh b/themes/miu.sh index 590c91f..299766d 100755 --- a/themes/miu.sh +++ b/themes/miu.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b87a7a" # SYNTAX_STRING -COLOR_03="#7ab87a" # COMMAND -COLOR_04="#b8b87a" # COMMAND_COLOR2 -COLOR_05="#7a7ab8" # PATH -COLOR_06="#b87ab8" # SYNTAX_VAR -COLOR_07="#7ab8b8" # PROMP -COLOR_08="#d9d9d9" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b87a7a" # SYNTAX_STRING +export COLOR_03="#7ab87a" # COMMAND +export COLOR_04="#b8b87a" # COMMAND_COLOR2 +export COLOR_05="#7a7ab8" # PATH +export COLOR_06="#b87ab8" # SYNTAX_VAR +export COLOR_07="#7ab8b8" # PROMP +export COLOR_08="#d9d9d9" # -COLOR_09="#262626" # -COLOR_10="#dbbdbd" # COMMAND_ERROR -COLOR_11="#bddbbd" # EXEC -COLOR_12="#dbdbbd" # -COLOR_13="#bdbddb" # FOLDER -COLOR_14="#dbbddb" # -COLOR_15="#bddbdb" # -COLOR_16="#ffffff" # +export COLOR_09="#262626" # +export COLOR_10="#dbbdbd" # COMMAND_ERROR +export COLOR_11="#bddbbd" # EXEC +export COLOR_12="#dbdbbd" # +export COLOR_13="#bdbddb" # FOLDER +export COLOR_14="#dbbddb" # +export COLOR_15="#bddbdb" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0d1926" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Miu" +export BACKGROUND_COLOR="#0d1926" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Miu" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Miu" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/molokai.sh b/themes/molokai.sh index 103432e..10b3785 100755 --- a/themes/molokai.sh +++ b/themes/molokai.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1b1d1e" # HOST -COLOR_02="#7325FA" # SYNTAX_STRING -COLOR_03="#23E298" # COMMAND -COLOR_04="#60D4DF" # COMMAND_COLOR2 -COLOR_05="#D08010" # PATH -COLOR_06="#FF0087" # SYNTAX_VAR -COLOR_07="#D0A843" # PROMP -COLOR_08="#BBBBBB" # +export COLOR_01="#1b1d1e" # HOST +export COLOR_02="#7325FA" # SYNTAX_STRING +export COLOR_03="#23E298" # COMMAND +export COLOR_04="#60D4DF" # COMMAND_COLOR2 +export COLOR_05="#D08010" # PATH +export COLOR_06="#FF0087" # SYNTAX_VAR +export COLOR_07="#D0A843" # PROMP +export COLOR_08="#BBBBBB" # -COLOR_09="#555555" # -COLOR_10="#9D66F6" # COMMAND_ERROR -COLOR_11="#5FE0B1" # EXEC -COLOR_12="#6DF2FF" # -COLOR_13="#FFAF00" # FOLDER -COLOR_14="#FF87AF" # -COLOR_15="#FFCE51" # -COLOR_16="#FFFFFF" # +export COLOR_09="#555555" # +export COLOR_10="#9D66F6" # COMMAND_ERROR +export COLOR_11="#5FE0B1" # EXEC +export COLOR_12="#6DF2FF" # +export COLOR_13="#FFAF00" # FOLDER +export COLOR_14="#FF87AF" # +export COLOR_15="#FFCE51" # +export COLOR_16="#FFFFFF" # -BACKGROUND_COLOR="#1b1d1e" # Background Color -FOREGROUND_COLOR="#BBBBBB" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Molokai" +export BACKGROUND_COLOR="#1b1d1e" # Background Color +export FOREGROUND_COLOR="#BBBBBB" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Molokai" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Molokai" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/mona-lisa.sh b/themes/mona-lisa.sh index bef9bb7..7eee435 100755 --- a/themes/mona-lisa.sh +++ b/themes/mona-lisa.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#351b0e" # HOST -COLOR_02="#9b291c" # SYNTAX_STRING -COLOR_03="#636232" # COMMAND -COLOR_04="#c36e28" # COMMAND_COLOR2 -COLOR_05="#515c5d" # PATH -COLOR_06="#9b1d29" # SYNTAX_VAR -COLOR_07="#588056" # PROMP -COLOR_08="#f7d75c" # +export COLOR_01="#351b0e" # HOST +export COLOR_02="#9b291c" # SYNTAX_STRING +export COLOR_03="#636232" # COMMAND +export COLOR_04="#c36e28" # COMMAND_COLOR2 +export COLOR_05="#515c5d" # PATH +export COLOR_06="#9b1d29" # SYNTAX_VAR +export COLOR_07="#588056" # PROMP +export COLOR_08="#f7d75c" # -COLOR_09="#874228" # -COLOR_10="#ff4331" # COMMAND_ERROR -COLOR_11="#b4b264" # EXEC -COLOR_12="#ff9566" # -COLOR_13="#9eb2b4" # FOLDER -COLOR_14="#ff5b6a" # -COLOR_15="#8acd8f" # -COLOR_16="#ffe598" # +export COLOR_09="#874228" # +export COLOR_10="#ff4331" # COMMAND_ERROR +export COLOR_11="#b4b264" # EXEC +export COLOR_12="#ff9566" # +export COLOR_13="#9eb2b4" # FOLDER +export COLOR_14="#ff5b6a" # +export COLOR_15="#8acd8f" # +export COLOR_16="#ffe598" # -BACKGROUND_COLOR="#120b0d" # Background Color -FOREGROUND_COLOR="#f7d66a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Mona Lisa" +export BACKGROUND_COLOR="#120b0d" # Background Color +export FOREGROUND_COLOR="#f7d66a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Mona Lisa" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Mona Lisa" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/monokai-dark.sh b/themes/monokai-dark.sh index 779152c..26600c0 100755 --- a/themes/monokai-dark.sh +++ b/themes/monokai-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#75715e" # HOST -COLOR_02="#f92672" # SYNTAX_STRING -COLOR_03="#a6e22e" # COMMAND -COLOR_04="#f4bf75" # COMMAND_COLOR2 -COLOR_05="#66d9ef" # PATH -COLOR_06="#ae81ff" # SYNTAX_VAR -COLOR_07="#2AA198" # PROMP -COLOR_08="#f9f8f5" # +export COLOR_01="#75715e" # HOST +export COLOR_02="#f92672" # SYNTAX_STRING +export COLOR_03="#a6e22e" # COMMAND +export COLOR_04="#f4bf75" # COMMAND_COLOR2 +export COLOR_05="#66d9ef" # PATH +export COLOR_06="#ae81ff" # SYNTAX_VAR +export COLOR_07="#2AA198" # PROMP +export COLOR_08="#f9f8f5" # -COLOR_09="#272822" # -COLOR_10="#f92672" # COMMAND_ERROR -COLOR_11="#a6e22e" # EXEC -COLOR_12="#f4bf75" # -COLOR_13="#66d9ef" # FOLDER -COLOR_14="#ae81ff" # -COLOR_15="#2AA198" # -COLOR_16="#f8f8f2" # +export COLOR_09="#272822" # +export COLOR_10="#f92672" # COMMAND_ERROR +export COLOR_11="#a6e22e" # EXEC +export COLOR_12="#f4bf75" # +export COLOR_13="#66d9ef" # FOLDER +export COLOR_14="#ae81ff" # +export COLOR_15="#2AA198" # +export COLOR_16="#f8f8f2" # -BACKGROUND_COLOR="#272822" # Background Color -FOREGROUND_COLOR="#f8f8f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Monokai Dark" +export BACKGROUND_COLOR="#272822" # Background Color +export FOREGROUND_COLOR="#f8f8f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Monokai Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Monokai Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/monokai-soda.sh b/themes/monokai-soda.sh index b7e886c..31b034d 100755 --- a/themes/monokai-soda.sh +++ b/themes/monokai-soda.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1a1a1a" # HOST -COLOR_02="#f4005f" # SYNTAX_STRING -COLOR_03="#98e024" # COMMAND -COLOR_04="#fa8419" # COMMAND_COLOR2 -COLOR_05="#9d65ff" # PATH -COLOR_06="#f4005f" # SYNTAX_VAR -COLOR_07="#58d1eb" # PROMP -COLOR_08="#c4c5b5" # +export COLOR_01="#1a1a1a" # HOST +export COLOR_02="#f4005f" # SYNTAX_STRING +export COLOR_03="#98e024" # COMMAND +export COLOR_04="#fa8419" # COMMAND_COLOR2 +export COLOR_05="#9d65ff" # PATH +export COLOR_06="#f4005f" # SYNTAX_VAR +export COLOR_07="#58d1eb" # PROMP +export COLOR_08="#c4c5b5" # -COLOR_09="#625e4c" # -COLOR_10="#f4005f" # COMMAND_ERROR -COLOR_11="#98e024" # EXEC -COLOR_12="#e0d561" # -COLOR_13="#9d65ff" # FOLDER -COLOR_14="#f4005f" # -COLOR_15="#58d1eb" # -COLOR_16="#f6f6ef" # +export COLOR_09="#625e4c" # +export COLOR_10="#f4005f" # COMMAND_ERROR +export COLOR_11="#98e024" # EXEC +export COLOR_12="#e0d561" # +export COLOR_13="#9d65ff" # FOLDER +export COLOR_14="#f4005f" # +export COLOR_15="#58d1eb" # +export COLOR_16="#f6f6ef" # -BACKGROUND_COLOR="#1a1a1a" # Background Color -FOREGROUND_COLOR="#c4c5b5" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Monokai Soda" +export BACKGROUND_COLOR="#1a1a1a" # Background Color +export FOREGROUND_COLOR="#c4c5b5" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Monokai Soda" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Monokai Soda" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/n0tch2k.sh b/themes/n0tch2k.sh index 9b65754..e8a0f52 100755 --- a/themes/n0tch2k.sh +++ b/themes/n0tch2k.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#383838" # HOST -COLOR_02="#a95551" # SYNTAX_STRING -COLOR_03="#666666" # COMMAND -COLOR_04="#a98051" # COMMAND_COLOR2 -COLOR_05="#657d3e" # PATH -COLOR_06="#767676" # SYNTAX_VAR -COLOR_07="#c9c9c9" # PROMP -COLOR_08="#d0b8a3" # +export COLOR_01="#383838" # HOST +export COLOR_02="#a95551" # SYNTAX_STRING +export COLOR_03="#666666" # COMMAND +export COLOR_04="#a98051" # COMMAND_COLOR2 +export COLOR_05="#657d3e" # PATH +export COLOR_06="#767676" # SYNTAX_VAR +export COLOR_07="#c9c9c9" # PROMP +export COLOR_08="#d0b8a3" # -COLOR_09="#474747" # -COLOR_10="#a97775" # COMMAND_ERROR -COLOR_11="#8c8c8c" # EXEC -COLOR_12="#a99175" # -COLOR_13="#98bd5e" # FOLDER -COLOR_14="#a3a3a3" # -COLOR_15="#dcdcdc" # -COLOR_16="#d8c8bb" # +export COLOR_09="#474747" # +export COLOR_10="#a97775" # COMMAND_ERROR +export COLOR_11="#8c8c8c" # EXEC +export COLOR_12="#a99175" # +export COLOR_13="#98bd5e" # FOLDER +export COLOR_14="#a3a3a3" # +export COLOR_15="#dcdcdc" # +export COLOR_16="#d8c8bb" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#a0a0a0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="N0tch2k" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#a0a0a0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="N0tch2k" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="N0tch2k" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/neopolitan.sh b/themes/neopolitan.sh index 7de6968..62e38c8 100755 --- a/themes/neopolitan.sh +++ b/themes/neopolitan.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#800000" # SYNTAX_STRING -COLOR_03="#61ce3c" # COMMAND -COLOR_04="#fbde2d" # COMMAND_COLOR2 -COLOR_05="#253b76" # PATH -COLOR_06="#ff0080" # SYNTAX_VAR -COLOR_07="#8da6ce" # PROMP -COLOR_08="#f8f8f8" # +export COLOR_01="#000000" # HOST +export COLOR_02="#800000" # SYNTAX_STRING +export COLOR_03="#61ce3c" # COMMAND +export COLOR_04="#fbde2d" # COMMAND_COLOR2 +export COLOR_05="#253b76" # PATH +export COLOR_06="#ff0080" # SYNTAX_VAR +export COLOR_07="#8da6ce" # PROMP +export COLOR_08="#f8f8f8" # -COLOR_09="#000000" # -COLOR_10="#800000" # COMMAND_ERROR -COLOR_11="#61ce3c" # EXEC -COLOR_12="#fbde2d" # -COLOR_13="#253b76" # FOLDER -COLOR_14="#ff0080" # -COLOR_15="#8da6ce" # -COLOR_16="#f8f8f8" # +export COLOR_09="#000000" # +export COLOR_10="#800000" # COMMAND_ERROR +export COLOR_11="#61ce3c" # EXEC +export COLOR_12="#fbde2d" # +export COLOR_13="#253b76" # FOLDER +export COLOR_14="#ff0080" # +export COLOR_15="#8da6ce" # +export COLOR_16="#f8f8f8" # -BACKGROUND_COLOR="#271f19" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Neopolitan" +export BACKGROUND_COLOR="#271f19" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Neopolitan" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Neopolitan" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nep.sh b/themes/nep.sh index be8e9ec..f4a848b 100755 --- a/themes/nep.sh +++ b/themes/nep.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#dd6f00" # SYNTAX_STRING -COLOR_03="#00dd6f" # COMMAND -COLOR_04="#6fdd00" # COMMAND_COLOR2 -COLOR_05="#6f00dd" # PATH -COLOR_06="#dd006f" # SYNTAX_VAR -COLOR_07="#006fdd" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#000000" # HOST +export COLOR_02="#dd6f00" # SYNTAX_STRING +export COLOR_03="#00dd6f" # COMMAND +export COLOR_04="#6fdd00" # COMMAND_COLOR2 +export COLOR_05="#6f00dd" # PATH +export COLOR_06="#dd006f" # SYNTAX_VAR +export COLOR_07="#006fdd" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#7d7d7d" # -COLOR_10="#ffb974" # COMMAND_ERROR -COLOR_11="#74ffb9" # EXEC -COLOR_12="#b9ff74" # -COLOR_13="#b974ff" # FOLDER -COLOR_14="#ff74b9" # -COLOR_15="#74b9ff" # -COLOR_16="#ffffff" # +export COLOR_09="#7d7d7d" # +export COLOR_10="#ffb974" # COMMAND_ERROR +export COLOR_11="#74ffb9" # EXEC +export COLOR_12="#b9ff74" # +export COLOR_13="#b974ff" # FOLDER +export COLOR_14="#ff74b9" # +export COLOR_15="#74b9ff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#758480" # Background Color -FOREGROUND_COLOR="#23476a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Nep" +export BACKGROUND_COLOR="#758480" # Background Color +export FOREGROUND_COLOR="#23476a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Nep" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Nep" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/neutron.sh b/themes/neutron.sh index 5da82ca..924c584 100755 --- a/themes/neutron.sh +++ b/themes/neutron.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#23252b" # HOST -COLOR_02="#b54036" # SYNTAX_STRING -COLOR_03="#5ab977" # COMMAND -COLOR_04="#deb566" # COMMAND_COLOR2 -COLOR_05="#6a7c93" # PATH -COLOR_06="#a4799d" # SYNTAX_VAR -COLOR_07="#3f94a8" # PROMP -COLOR_08="#e6e8ef" # +export COLOR_01="#23252b" # HOST +export COLOR_02="#b54036" # SYNTAX_STRING +export COLOR_03="#5ab977" # COMMAND +export COLOR_04="#deb566" # COMMAND_COLOR2 +export COLOR_05="#6a7c93" # PATH +export COLOR_06="#a4799d" # SYNTAX_VAR +export COLOR_07="#3f94a8" # PROMP +export COLOR_08="#e6e8ef" # -COLOR_09="#23252b" # -COLOR_10="#b54036" # COMMAND_ERROR -COLOR_11="#5ab977" # EXEC -COLOR_12="#deb566" # -COLOR_13="#6a7c93" # FOLDER -COLOR_14="#a4799d" # -COLOR_15="#3f94a8" # -COLOR_16="#ebedf2" # +export COLOR_09="#23252b" # +export COLOR_10="#b54036" # COMMAND_ERROR +export COLOR_11="#5ab977" # EXEC +export COLOR_12="#deb566" # +export COLOR_13="#6a7c93" # FOLDER +export COLOR_14="#a4799d" # +export COLOR_15="#3f94a8" # +export COLOR_16="#ebedf2" # -BACKGROUND_COLOR="#1c1e22" # Background Color -FOREGROUND_COLOR="#e6e8ef" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Neutron" +export BACKGROUND_COLOR="#1c1e22" # Background Color +export FOREGROUND_COLOR="#e6e8ef" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Neutron" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Neutron" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nightlion-v1.sh b/themes/nightlion-v1.sh index dcf9340..7bf25db 100755 --- a/themes/nightlion-v1.sh +++ b/themes/nightlion-v1.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4c4c4c" # HOST -COLOR_02="#bb0000" # SYNTAX_STRING -COLOR_03="#5fde8f" # COMMAND -COLOR_04="#f3f167" # COMMAND_COLOR2 -COLOR_05="#276bd8" # PATH -COLOR_06="#bb00bb" # SYNTAX_VAR -COLOR_07="#00dadf" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#4c4c4c" # HOST +export COLOR_02="#bb0000" # SYNTAX_STRING +export COLOR_03="#5fde8f" # COMMAND +export COLOR_04="#f3f167" # COMMAND_COLOR2 +export COLOR_05="#276bd8" # PATH +export COLOR_06="#bb00bb" # SYNTAX_VAR +export COLOR_07="#00dadf" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#55ff55" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#55ff55" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#bbbbbb" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Nightlion V1" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#bbbbbb" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Nightlion V1" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Nightlion V1" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nightlion-v2.sh b/themes/nightlion-v2.sh index a4b45d4..71c2246 100755 --- a/themes/nightlion-v2.sh +++ b/themes/nightlion-v2.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4c4c4c" # HOST -COLOR_02="#bb0000" # SYNTAX_STRING -COLOR_03="#04f623" # COMMAND -COLOR_04="#f3f167" # COMMAND_COLOR2 -COLOR_05="#64d0f0" # PATH -COLOR_06="#ce6fdb" # SYNTAX_VAR -COLOR_07="#00dadf" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#4c4c4c" # HOST +export COLOR_02="#bb0000" # SYNTAX_STRING +export COLOR_03="#04f623" # COMMAND +export COLOR_04="#f3f167" # COMMAND_COLOR2 +export COLOR_05="#64d0f0" # PATH +export COLOR_06="#ce6fdb" # SYNTAX_VAR +export COLOR_07="#00dadf" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#7df71d" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#62cbe8" # FOLDER -COLOR_14="#ff9bf5" # -COLOR_15="#00ccd8" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#7df71d" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#62cbe8" # FOLDER +export COLOR_14="#ff9bf5" # +export COLOR_15="#00ccd8" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#171717" # Background Color -FOREGROUND_COLOR="#bbbbbb" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Nightlion V2" +export BACKGROUND_COLOR="#171717" # Background Color +export FOREGROUND_COLOR="#bbbbbb" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Nightlion V2" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Nightlion V2" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nighty.sh b/themes/nighty.sh index e7c23d2..4111bdd 100755 --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#373D48" # Black -COLOR_02="#9B3E46" # Red -COLOR_03="#095B32" # Green -COLOR_04="#808020" # Yellow -COLOR_05="#1D3E6F" # Blue -COLOR_06="#823065" # Cyan -COLOR_07="#3A7458" # Magenta -COLOR_08="#828282" # Light gray +export COLOR_01="#373D48" # Black +export COLOR_02="#9B3E46" # Red +export COLOR_03="#095B32" # Green +export COLOR_04="#808020" # Yellow +export COLOR_05="#1D3E6F" # Blue +export COLOR_06="#823065" # Cyan +export COLOR_07="#3A7458" # Magenta +export COLOR_08="#828282" # Light gray -COLOR_09="#5C6370" # Dark gray -COLOR_10="#D0555F" # Light Red -COLOR_11="#119955" # AM77 Green -COLOR_12="#DFE048" # Light Yellow -COLOR_13="#4674B8" # Light Blue -COLOR_14="#ED86C9" # Light Cyan -COLOR_15="#70D2A4" # Light Magenta -COLOR_16="#DFDFDF" # White +export COLOR_09="#5C6370" # Dark gray +export COLOR_10="#D0555F" # Light Red +export COLOR_11="#119955" # AM77 Green +export COLOR_12="#DFE048" # Light Yellow +export COLOR_13="#4674B8" # Light Blue +export COLOR_14="#ED86C9" # Light Cyan +export COLOR_15="#70D2A4" # Light Magenta +export COLOR_16="#DFDFDF" # White -BACKGROUND_COLOR="#2F2F2F" # Background Color -FOREGROUND_COLOR="#DFDFDF" # Foreground Color (text) -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -PROFILE_NAME="nighty" +export BACKGROUND_COLOR="#2F2F2F" # Background Color +export FOREGROUND_COLOR="#DFDFDF" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="nighty" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="nighty" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nord-light.sh b/themes/nord-light.sh index 4ed80e9..7928315 100755 --- a/themes/nord-light.sh +++ b/themes/nord-light.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#353535" #black -COLOR_02="#E64569" #red -COLOR_03="#89D287" #green -COLOR_04="#DAB752" #yellow -COLOR_05="#439ECF" #blue -COLOR_06="#D961DC" #magenta -COLOR_07="#64AAAF" #cyan -COLOR_08="#B3B3B3" #white +export COLOR_01="#353535" #black +export COLOR_02="#E64569" #red +export COLOR_03="#89D287" #green +export COLOR_04="#DAB752" #yellow +export COLOR_05="#439ECF" #blue +export COLOR_06="#D961DC" #magenta +export COLOR_07="#64AAAF" #cyan +export COLOR_08="#B3B3B3" #white -COLOR_09="#535353" #lightBlack -COLOR_10="#E4859A" #lightRed -COLOR_11="#A2CCA1" #lightGreen -COLOR_12="#E1E387" #lightYellow -COLOR_13="#6FBBE2" #lightBlue -COLOR_14="#E586E7" #lightMagenta -COLOR_15="#96DCDA" #lightCyan -COLOR_16="#DEDEDE" #lightWhite +export COLOR_09="#535353" #lightBlack +export COLOR_10="#E4859A" #lightRed +export COLOR_11="#A2CCA1" #lightGreen +export COLOR_12="#E1E387" #lightYellow +export COLOR_13="#6FBBE2" #lightBlue +export COLOR_14="#E586E7" #lightMagenta +export COLOR_15="#96DCDA" #lightCyan +export COLOR_16="#DEDEDE" #lightWhite -BACKGROUND_COLOR="#ebeaf2" -FOREGROUND_COLOR="#004f7c" -CURSOR_COLOR=$COLOR_05 -PROFILE_NAME="Nord Light" +export BACKGROUND_COLOR="#ebeaf2" +export FOREGROUND_COLOR="#004f7c" +export CURSOR_COLOR=$COLOR_05 +export PROFILE_NAME="Nord Light" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Nord Light" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/nord.sh b/themes/nord.sh index 1b59cff..7a267ec 100755 --- a/themes/nord.sh +++ b/themes/nord.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#353535" #black -COLOR_02="#E64569" #red -COLOR_03="#89D287" #green -COLOR_04="#DAB752" #yellow -COLOR_05="#439ECF" #blue -COLOR_06="#D961DC" #magenta -COLOR_07="#64AAAF" #cyan -COLOR_08="#B3B3B3" #white +export COLOR_01="#353535" #black +export COLOR_02="#E64569" #red +export COLOR_03="#89D287" #green +export COLOR_04="#DAB752" #yellow +export COLOR_05="#439ECF" #blue +export COLOR_06="#D961DC" #magenta +export COLOR_07="#64AAAF" #cyan +export COLOR_08="#B3B3B3" #white -COLOR_09="#535353" #lightBlack -COLOR_10="#E4859A" #lightRed -COLOR_11="#A2CCA1" #lightGreen -COLOR_12="#E1E387" #lightYellow -COLOR_13="#6FBBE2" #lightBlue -COLOR_14="#E586E7" #lightMagenta -COLOR_15="#96DCDA" #lightCyan -COLOR_16="#DEDEDE" #lightWhite +export COLOR_09="#535353" #lightBlack +export COLOR_10="#E4859A" #lightRed +export COLOR_11="#A2CCA1" #lightGreen +export COLOR_12="#E1E387" #lightYellow +export COLOR_13="#6FBBE2" #lightBlue +export COLOR_14="#E586E7" #lightMagenta +export COLOR_15="#96DCDA" #lightCyan +export COLOR_16="#DEDEDE" #lightWhite -BACKGROUND_COLOR=$COLOR_01 -FOREGROUND_COLOR=$COLOR_05 -CURSOR_COLOR=$COLOR_05 -PROFILE_NAME="Nord" +export BACKGROUND_COLOR=$COLOR_01 +export FOREGROUND_COLOR=$COLOR_05 +export CURSOR_COLOR=$COLOR_05 +export PROFILE_NAME="Nord" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Nord" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/novel.sh b/themes/novel.sh index 6501e87..434d56b 100755 --- a/themes/novel.sh +++ b/themes/novel.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#cc0000" # SYNTAX_STRING -COLOR_03="#009600" # COMMAND -COLOR_04="#d06b00" # COMMAND_COLOR2 -COLOR_05="#0000cc" # PATH -COLOR_06="#cc00cc" # SYNTAX_VAR -COLOR_07="#0087cc" # PROMP -COLOR_08="#cccccc" # +export COLOR_01="#000000" # HOST +export COLOR_02="#cc0000" # SYNTAX_STRING +export COLOR_03="#009600" # COMMAND +export COLOR_04="#d06b00" # COMMAND_COLOR2 +export COLOR_05="#0000cc" # PATH +export COLOR_06="#cc00cc" # SYNTAX_VAR +export COLOR_07="#0087cc" # PROMP +export COLOR_08="#cccccc" # -COLOR_09="#808080" # -COLOR_10="#cc0000" # COMMAND_ERROR -COLOR_11="#009600" # EXEC -COLOR_12="#d06b00" # -COLOR_13="#0000cc" # FOLDER -COLOR_14="#cc00cc" # -COLOR_15="#0087cc" # -COLOR_16="#ffffff" # +export COLOR_09="#808080" # +export COLOR_10="#cc0000" # COMMAND_ERROR +export COLOR_11="#009600" # EXEC +export COLOR_12="#d06b00" # +export COLOR_13="#0000cc" # FOLDER +export COLOR_14="#cc00cc" # +export COLOR_15="#0087cc" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#dfdbc3" # Background Color -FOREGROUND_COLOR="#3b2322" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Novel" +export BACKGROUND_COLOR="#dfdbc3" # Background Color +export FOREGROUND_COLOR="#3b2322" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Novel" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Novel" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/obsidian.sh b/themes/obsidian.sh index f9cd043..07d40b3 100755 --- a/themes/obsidian.sh +++ b/themes/obsidian.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#a60001" # SYNTAX_STRING -COLOR_03="#00bb00" # COMMAND -COLOR_04="#fecd22" # COMMAND_COLOR2 -COLOR_05="#3a9bdb" # PATH -COLOR_06="#bb00bb" # SYNTAX_VAR -COLOR_07="#00bbbb" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#a60001" # SYNTAX_STRING +export COLOR_03="#00bb00" # COMMAND +export COLOR_04="#fecd22" # COMMAND_COLOR2 +export COLOR_05="#3a9bdb" # PATH +export COLOR_06="#bb00bb" # SYNTAX_VAR +export COLOR_07="#00bbbb" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#ff0003" # COMMAND_ERROR -COLOR_11="#93c863" # EXEC -COLOR_12="#fef874" # -COLOR_13="#a1d7ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff0003" # COMMAND_ERROR +export COLOR_11="#93c863" # EXEC +export COLOR_12="#fef874" # +export COLOR_13="#a1d7ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#283033" # Background Color -FOREGROUND_COLOR="#cdcdcd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Obsidian" +export BACKGROUND_COLOR="#283033" # Background Color +export FOREGROUND_COLOR="#cdcdcd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Obsidian" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Obsidian" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ocean-dark.sh b/themes/ocean-dark.sh index 5f3c3d2..2625c10 100755 --- a/themes/ocean-dark.sh +++ b/themes/ocean-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4F4F4F" -COLOR_02="#AF4B57" -COLOR_03="#AFD383" -COLOR_04="#E5C079" -COLOR_05="#7D90A4" -COLOR_06="#A4799D" -COLOR_07="#85A6A5" -COLOR_08="#EEEDEE" +export COLOR_01="#4F4F4F" +export COLOR_02="#AF4B57" +export COLOR_03="#AFD383" +export COLOR_04="#E5C079" +export COLOR_05="#7D90A4" +export COLOR_06="#A4799D" +export COLOR_07="#85A6A5" +export COLOR_08="#EEEDEE" -COLOR_09="#7B7B7B" -COLOR_10="#AF4B57" -COLOR_11="#CEFFAB" -COLOR_12="#FFFECC" -COLOR_13="#B5DCFE" -COLOR_14="#FB9BFE" -COLOR_15="#DFDFFD" -COLOR_16="#FEFFFE" +export COLOR_09="#7B7B7B" +export COLOR_10="#AF4B57" +export COLOR_11="#CEFFAB" +export COLOR_12="#FFFECC" +export COLOR_13="#B5DCFE" +export COLOR_14="#FB9BFE" +export COLOR_15="#DFDFFD" +export COLOR_16="#FEFFFE" -BACKGROUND_COLOR="#1C1F27" -FOREGROUND_COLOR="#979CAC" -CURSOR_COLOR="#979CAC" -PROFILE_NAME="Ocean Dark" +export BACKGROUND_COLOR="#1C1F27" +export FOREGROUND_COLOR="#979CAC" +export CURSOR_COLOR="#979CAC" +export PROFILE_NAME="Ocean Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Ocean Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ocean.sh b/themes/ocean.sh index b44168c..233b46e 100755 --- a/themes/ocean.sh +++ b/themes/ocean.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#990000" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#999900" # COMMAND_COLOR2 -COLOR_05="#0000b2" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#990000" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#999900" # COMMAND_COLOR2 +export COLOR_05="#0000b2" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#00d900" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#00d900" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#224fbc" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Ocean" +export BACKGROUND_COLOR="#224fbc" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Ocean" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Ocean" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/oceanic-next.sh b/themes/oceanic-next.sh index d1a723b..f68d6ec 100755 --- a/themes/oceanic-next.sh +++ b/themes/oceanic-next.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#121C21" # HOST -COLOR_02="#E44754" # SYNTAX_STRING -COLOR_03="#89BD82" # COMMAND -COLOR_04="#F7BD51" # COMMAND_COLOR2 -COLOR_05="#5486C0" # PATH -COLOR_06="#B77EB8" # SYNTAX_VAR -COLOR_07="#50A5A4" # PROMP -COLOR_08="#FFFFFF" # +export COLOR_01="#121C21" # HOST +export COLOR_02="#E44754" # SYNTAX_STRING +export COLOR_03="#89BD82" # COMMAND +export COLOR_04="#F7BD51" # COMMAND_COLOR2 +export COLOR_05="#5486C0" # PATH +export COLOR_06="#B77EB8" # SYNTAX_VAR +export COLOR_07="#50A5A4" # PROMP +export COLOR_08="#FFFFFF" # -COLOR_09="#52606B" # -COLOR_10="#E44754" # COMMAND_ERROR -COLOR_11="#89BD82" # EXEC -COLOR_12="#F7BD51" # -COLOR_13="#5486C0" # FOLDER -COLOR_14="#B77EB8" # -COLOR_15="#50A5A4" # -COLOR_16="#FFFFFF" # +export COLOR_09="#52606B" # +export COLOR_10="#E44754" # COMMAND_ERROR +export COLOR_11="#89BD82" # EXEC +export COLOR_12="#F7BD51" # +export COLOR_13="#5486C0" # FOLDER +export COLOR_14="#B77EB8" # +export COLOR_15="#50A5A4" # +export COLOR_16="#FFFFFF" # -BACKGROUND_COLOR="#121b21" # Background Color -FOREGROUND_COLOR="#b3b8c3" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Oceanic Next" +export BACKGROUND_COLOR="#121b21" # Background Color +export FOREGROUND_COLOR="#b3b8c3" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Oceanic Next" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Oceanic Next" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ollie.sh b/themes/ollie.sh index ca76094..4cdc5a7 100755 --- a/themes/ollie.sh +++ b/themes/ollie.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ac2e31" # SYNTAX_STRING -COLOR_03="#31ac61" # COMMAND -COLOR_04="#ac4300" # COMMAND_COLOR2 -COLOR_05="#2d57ac" # PATH -COLOR_06="#b08528" # SYNTAX_VAR -COLOR_07="#1fa6ac" # PROMP -COLOR_08="#8a8eac" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ac2e31" # SYNTAX_STRING +export COLOR_03="#31ac61" # COMMAND +export COLOR_04="#ac4300" # COMMAND_COLOR2 +export COLOR_05="#2d57ac" # PATH +export COLOR_06="#b08528" # SYNTAX_VAR +export COLOR_07="#1fa6ac" # PROMP +export COLOR_08="#8a8eac" # -COLOR_09="#5b3725" # -COLOR_10="#ff3d48" # COMMAND_ERROR -COLOR_11="#3bff99" # EXEC -COLOR_12="#ff5e1e" # -COLOR_13="#4488ff" # FOLDER -COLOR_14="#ffc21d" # -COLOR_15="#1ffaff" # -COLOR_16="#5b6ea7" # +export COLOR_09="#5b3725" # +export COLOR_10="#ff3d48" # COMMAND_ERROR +export COLOR_11="#3bff99" # EXEC +export COLOR_12="#ff5e1e" # +export COLOR_13="#4488ff" # FOLDER +export COLOR_14="#ffc21d" # +export COLOR_15="#1ffaff" # +export COLOR_16="#5b6ea7" # -BACKGROUND_COLOR="#222125" # Background Color -FOREGROUND_COLOR="#8a8dae" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Ollie" +export BACKGROUND_COLOR="#222125" # Background Color +export FOREGROUND_COLOR="#8a8dae" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Ollie" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Ollie" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/one-dark.sh b/themes/one-dark.sh index dcdc544..f4ef7e2 100755 --- a/themes/one-dark.sh +++ b/themes/one-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#E06C75" -COLOR_03="#98C379" -COLOR_04="#D19A66" -COLOR_05="#61AFEF" -COLOR_06="#C678DD" -COLOR_07="#56B6C2" -COLOR_08="#ABB2BF" +export COLOR_01="#000000" +export COLOR_02="#E06C75" +export COLOR_03="#98C379" +export COLOR_04="#D19A66" +export COLOR_05="#61AFEF" +export COLOR_06="#C678DD" +export COLOR_07="#56B6C2" +export COLOR_08="#ABB2BF" -COLOR_09="#5C6370" -COLOR_10="#E06C75" -COLOR_11="#98C379" -COLOR_12="#D19A66" -COLOR_13="#61AFEF" -COLOR_14="#C678DD" -COLOR_15="#56B6C2" -COLOR_16="#FFFEFE" +export COLOR_09="#5C6370" +export COLOR_10="#E06C75" +export COLOR_11="#98C379" +export COLOR_12="#D19A66" +export COLOR_13="#61AFEF" +export COLOR_14="#C678DD" +export COLOR_15="#56B6C2" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#1E2127" -FOREGROUND_COLOR="#5C6370" -CURSOR_COLOR="#5C6370" -PROFILE_NAME="One Dark" +export BACKGROUND_COLOR="#1E2127" +export FOREGROUND_COLOR="#5C6370" +export CURSOR_COLOR="#5C6370" +export PROFILE_NAME="One Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="One Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/one-half-black.sh b/themes/one-half-black.sh index 7e251b5..2e4a372 100755 --- a/themes/one-half-black.sh +++ b/themes/one-half-black.sh @@ -3,28 +3,28 @@ # Son A. Pham under the MIT license: https://github.com/sonph/onehalf # ====================CONFIG THIS =============================== # -COLOR_01="#282c34" # HOST -COLOR_02="#e06c75" # SYNTAX_STRING -COLOR_03="#98c379" # COMMAND -COLOR_04="#e5c07b" # COMMAND_COLOR2 -COLOR_05="#61afef" # PATH -COLOR_06="#c678dd" # SYNTAX_VAR -COLOR_07="#56b6c2" # PROMP -COLOR_08="#dcdfe4" # +export COLOR_01="#282c34" # HOST +export COLOR_02="#e06c75" # SYNTAX_STRING +export COLOR_03="#98c379" # COMMAND +export COLOR_04="#e5c07b" # COMMAND_COLOR2 +export COLOR_05="#61afef" # PATH +export COLOR_06="#c678dd" # SYNTAX_VAR +export COLOR_07="#56b6c2" # PROMP +export COLOR_08="#dcdfe4" # -COLOR_09="#282c34" # -COLOR_10="#e06c75" # COMMAND_ERROR -COLOR_11="#98c379" # EXEC -COLOR_12="#e5c07b" # -COLOR_13="#61afef" # FOLDER -COLOR_14="#c678dd" # -COLOR_15="#56b6c2" # -COLOR_16="#dcdfe4" # +export COLOR_09="#282c34" # +export COLOR_10="#e06c75" # COMMAND_ERROR +export COLOR_11="#98c379" # EXEC +export COLOR_12="#e5c07b" # +export COLOR_13="#61afef" # FOLDER +export COLOR_14="#c678dd" # +export COLOR_15="#56b6c2" # +export COLOR_16="#dcdfe4" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#dcdfe4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="One Half Black" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#dcdfe4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="One Half Black" # ============================================= @@ -36,22 +36,21 @@ PROFILE_NAME="One Half Black" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/one-light.sh b/themes/one-light.sh index 6d88a23..4f8ce2e 100755 --- a/themes/one-light.sh +++ b/themes/one-light.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#DA3E39" -COLOR_03="#41933E" -COLOR_04="#855504" -COLOR_05="#315EEE" -COLOR_06="#930092" -COLOR_07="#0E6FAD" -COLOR_08="#8E8F96" +export COLOR_01="#000000" +export COLOR_02="#DA3E39" +export COLOR_03="#41933E" +export COLOR_04="#855504" +export COLOR_05="#315EEE" +export COLOR_06="#930092" +export COLOR_07="#0E6FAD" +export COLOR_08="#8E8F96" -COLOR_09="#2A2B32" -COLOR_10="#DA3E39" -COLOR_11="#41933E" -COLOR_12="#855504" -COLOR_13="#315EEE" -COLOR_14="#930092" -COLOR_15="#0E6FAD" -COLOR_16="#FFFEFE" +export COLOR_09="#2A2B32" +export COLOR_10="#DA3E39" +export COLOR_11="#41933E" +export COLOR_12="#855504" +export COLOR_13="#315EEE" +export COLOR_14="#930092" +export COLOR_15="#0E6FAD" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#F8F8F8" -FOREGROUND_COLOR="#2A2B32" -CURSOR_COLOR="#2A2B32" -PROFILE_NAME="One Light" +export BACKGROUND_COLOR="#F8F8F8" +export FOREGROUND_COLOR="#2A2B32" +export CURSOR_COLOR="#2A2B32" +export PROFILE_NAME="One Light" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="One Light" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/pali.sh b/themes/pali.sh index 271edb6..0c6e6c8 100755 --- a/themes/pali.sh +++ b/themes/pali.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#0a0a0a" # HOST -COLOR_02="#ab8f74" # SYNTAX_STRING -COLOR_03="#74ab8f" # COMMAND -COLOR_04="#8fab74" # COMMAND_COLOR2 -COLOR_05="#8f74ab" # PATH -COLOR_06="#ab748f" # SYNTAX_VAR -COLOR_07="#748fab" # PROMP -COLOR_08="#F2F2F2" # +export COLOR_01="#0a0a0a" # HOST +export COLOR_02="#ab8f74" # SYNTAX_STRING +export COLOR_03="#74ab8f" # COMMAND +export COLOR_04="#8fab74" # COMMAND_COLOR2 +export COLOR_05="#8f74ab" # PATH +export COLOR_06="#ab748f" # SYNTAX_VAR +export COLOR_07="#748fab" # PROMP +export COLOR_08="#F2F2F2" # -COLOR_09="#5D5D5D" # -COLOR_10="#FF1D62" # COMMAND_ERROR -COLOR_11="#9cc3af" # EXEC -COLOR_12="#FFD00A" # -COLOR_13="#af9cc3" # FOLDER -COLOR_14="#FF1D62" # -COLOR_15="#4BB8FD" # -COLOR_16="#A020F0" # +export COLOR_09="#5D5D5D" # +export COLOR_10="#FF1D62" # COMMAND_ERROR +export COLOR_11="#9cc3af" # EXEC +export COLOR_12="#FFD00A" # +export COLOR_13="#af9cc3" # FOLDER +export COLOR_14="#FF1D62" # +export COLOR_15="#4BB8FD" # +export COLOR_16="#A020F0" # -BACKGROUND_COLOR="#232E37" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Pali" +export BACKGROUND_COLOR="#232E37" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Pali" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Pali" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/paraiso-dark.sh b/themes/paraiso-dark.sh index 545de4c..9eec8a8 100755 --- a/themes/paraiso-dark.sh +++ b/themes/paraiso-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2f1e2e" # HOST -COLOR_02="#ef6155" # SYNTAX_STRING -COLOR_03="#48b685" # COMMAND -COLOR_04="#fec418" # COMMAND_COLOR2 -COLOR_05="#06b6ef" # PATH -COLOR_06="#815ba4" # SYNTAX_VAR -COLOR_07="#5bc4bf" # PROMP -COLOR_08="#a39e9b" # +export COLOR_01="#2f1e2e" # HOST +export COLOR_02="#ef6155" # SYNTAX_STRING +export COLOR_03="#48b685" # COMMAND +export COLOR_04="#fec418" # COMMAND_COLOR2 +export COLOR_05="#06b6ef" # PATH +export COLOR_06="#815ba4" # SYNTAX_VAR +export COLOR_07="#5bc4bf" # PROMP +export COLOR_08="#a39e9b" # -COLOR_09="#776e71" # -COLOR_10="#ef6155" # COMMAND_ERROR -COLOR_11="#48b685" # EXEC -COLOR_12="#fec418" # -COLOR_13="#06b6ef" # FOLDER -COLOR_14="#815ba4" # -COLOR_15="#5bc4bf" # -COLOR_16="#e7e9db" # +export COLOR_09="#776e71" # +export COLOR_10="#ef6155" # COMMAND_ERROR +export COLOR_11="#48b685" # EXEC +export COLOR_12="#fec418" # +export COLOR_13="#06b6ef" # FOLDER +export COLOR_14="#815ba4" # +export COLOR_15="#5bc4bf" # +export COLOR_16="#e7e9db" # -BACKGROUND_COLOR="#2f1e2e" # Background Color -FOREGROUND_COLOR="#a39e9b" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Paraiso Dark" +export BACKGROUND_COLOR="#2f1e2e" # Background Color +export FOREGROUND_COLOR="#a39e9b" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Paraiso Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Paraiso Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/paul-millr.sh b/themes/paul-millr.sh index da2be08..e3f6325 100755 --- a/themes/paul-millr.sh +++ b/themes/paul-millr.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2a2a2a" # HOST -COLOR_02="#ff0000" # SYNTAX_STRING -COLOR_03="#79ff0f" # COMMAND -COLOR_04="#d3bf00" # COMMAND_COLOR2 -COLOR_05="#396bd7" # PATH -COLOR_06="#b449be" # SYNTAX_VAR -COLOR_07="#66ccff" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#2a2a2a" # HOST +export COLOR_02="#ff0000" # SYNTAX_STRING +export COLOR_03="#79ff0f" # COMMAND +export COLOR_04="#d3bf00" # COMMAND_COLOR2 +export COLOR_05="#396bd7" # PATH +export COLOR_06="#b449be" # SYNTAX_VAR +export COLOR_07="#66ccff" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#666666" # -COLOR_10="#ff0080" # COMMAND_ERROR -COLOR_11="#66ff66" # EXEC -COLOR_12="#f3d64e" # -COLOR_13="#709aed" # FOLDER -COLOR_14="#db67e6" # -COLOR_15="#7adff2" # -COLOR_16="#ffffff" # +export COLOR_09="#666666" # +export COLOR_10="#ff0080" # COMMAND_ERROR +export COLOR_11="#66ff66" # EXEC +export COLOR_12="#f3d64e" # +export COLOR_13="#709aed" # FOLDER +export COLOR_14="#db67e6" # +export COLOR_15="#7adff2" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#f2f2f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Paul Millr" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#f2f2f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Paul Millr" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Paul Millr" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/pencil-dark.sh b/themes/pencil-dark.sh index aa4cc35..c1775fe 100755 --- a/themes/pencil-dark.sh +++ b/themes/pencil-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#212121" # HOST -COLOR_02="#c30771" # SYNTAX_STRING -COLOR_03="#10a778" # COMMAND -COLOR_04="#a89c14" # COMMAND_COLOR2 -COLOR_05="#008ec4" # PATH -COLOR_06="#523c79" # SYNTAX_VAR -COLOR_07="#20a5ba" # PROMP -COLOR_08="#d9d9d9" # +export COLOR_01="#212121" # HOST +export COLOR_02="#c30771" # SYNTAX_STRING +export COLOR_03="#10a778" # COMMAND +export COLOR_04="#a89c14" # COMMAND_COLOR2 +export COLOR_05="#008ec4" # PATH +export COLOR_06="#523c79" # SYNTAX_VAR +export COLOR_07="#20a5ba" # PROMP +export COLOR_08="#d9d9d9" # -COLOR_09="#424242" # -COLOR_10="#fb007a" # COMMAND_ERROR -COLOR_11="#5fd7af" # EXEC -COLOR_12="#f3e430" # -COLOR_13="#20bbfc" # FOLDER -COLOR_14="#6855de" # -COLOR_15="#4fb8cc" # -COLOR_16="#f1f1f1" # +export COLOR_09="#424242" # +export COLOR_10="#fb007a" # COMMAND_ERROR +export COLOR_11="#5fd7af" # EXEC +export COLOR_12="#f3e430" # +export COLOR_13="#20bbfc" # FOLDER +export COLOR_14="#6855de" # +export COLOR_15="#4fb8cc" # +export COLOR_16="#f1f1f1" # -BACKGROUND_COLOR="#212121" # Background Color -FOREGROUND_COLOR="#f1f1f1" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Pencil Dark" +export BACKGROUND_COLOR="#212121" # Background Color +export FOREGROUND_COLOR="#f1f1f1" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Pencil Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Pencil Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/pencil-light.sh b/themes/pencil-light.sh index b0fce33..d9eb5d2 100755 --- a/themes/pencil-light.sh +++ b/themes/pencil-light.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#212121" # HOST -COLOR_02="#c30771" # SYNTAX_STRING -COLOR_03="#10a778" # COMMAND -COLOR_04="#a89c14" # COMMAND_COLOR2 -COLOR_05="#008ec4" # PATH -COLOR_06="#523c79" # SYNTAX_VAR -COLOR_07="#20a5ba" # PROMP -COLOR_08="#d9d9d9" # +export COLOR_01="#212121" # HOST +export COLOR_02="#c30771" # SYNTAX_STRING +export COLOR_03="#10a778" # COMMAND +export COLOR_04="#a89c14" # COMMAND_COLOR2 +export COLOR_05="#008ec4" # PATH +export COLOR_06="#523c79" # SYNTAX_VAR +export COLOR_07="#20a5ba" # PROMP +export COLOR_08="#d9d9d9" # -COLOR_09="#424242" # -COLOR_10="#fb007a" # COMMAND_ERROR -COLOR_11="#5fd7af" # EXEC -COLOR_12="#f3e430" # -COLOR_13="#20bbfc" # FOLDER -COLOR_14="#6855de" # -COLOR_15="#4fb8cc" # -COLOR_16="#f1f1f1" # +export COLOR_09="#424242" # +export COLOR_10="#fb007a" # COMMAND_ERROR +export COLOR_11="#5fd7af" # EXEC +export COLOR_12="#f3e430" # +export COLOR_13="#20bbfc" # FOLDER +export COLOR_14="#6855de" # +export COLOR_15="#4fb8cc" # +export COLOR_16="#f1f1f1" # -BACKGROUND_COLOR="#f1f1f1" # Background Color -FOREGROUND_COLOR="#424242" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Pencil Light" +export BACKGROUND_COLOR="#f1f1f1" # Background Color +export FOREGROUND_COLOR="#424242" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Pencil Light" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Pencil Light" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/peppermint.sh b/themes/peppermint.sh index c3d4ecf..2d9f4a2 100755 --- a/themes/peppermint.sh +++ b/themes/peppermint.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#353535" -COLOR_02="#E64569" -COLOR_03="#89D287" -COLOR_04="#DAB752" -COLOR_05="#439ECF" -COLOR_06="#D961DC" -COLOR_07="#64AAAF" -COLOR_08="#B3B3B3" +export COLOR_01="#353535" +export COLOR_02="#E64569" +export COLOR_03="#89D287" +export COLOR_04="#DAB752" +export COLOR_05="#439ECF" +export COLOR_06="#D961DC" +export COLOR_07="#64AAAF" +export COLOR_08="#B3B3B3" -COLOR_09="#535353" -COLOR_10="#E4859A" -COLOR_11="#A2CCA1" -COLOR_12="#E1E387" -COLOR_13="#6FBBE2" -COLOR_14="#E586E7" -COLOR_15="#96DCDA" -COLOR_16="#DEDEDE" +export COLOR_09="#535353" +export COLOR_10="#E4859A" +export COLOR_11="#A2CCA1" +export COLOR_12="#E1E387" +export COLOR_13="#6FBBE2" +export COLOR_14="#E586E7" +export COLOR_15="#96DCDA" +export COLOR_16="#DEDEDE" -BACKGROUND_COLOR="#000000" -FOREGROUND_COLOR="#C7C7C7" -CURSOR_COLOR="#BBBBBB" -PROFILE_NAME="Peppermint" +export BACKGROUND_COLOR="#000000" +export FOREGROUND_COLOR="#C7C7C7" +export CURSOR_COLOR="#BBBBBB" +export PROFILE_NAME="Peppermint" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Peppermint" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/pnevma.sh b/themes/pnevma.sh index 6739dfd..2637b90 100755 --- a/themes/pnevma.sh +++ b/themes/pnevma.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2f2e2d" # HOST -COLOR_02="#a36666" # SYNTAX_STRING -COLOR_03="#90a57d" # COMMAND -COLOR_04="#d7af87" # COMMAND_COLOR2 -COLOR_05="#7fa5bd" # PATH -COLOR_06="#c79ec4" # SYNTAX_VAR -COLOR_07="#8adbb4" # PROMP -COLOR_08="#d0d0d0" # +export COLOR_01="#2f2e2d" # HOST +export COLOR_02="#a36666" # SYNTAX_STRING +export COLOR_03="#90a57d" # COMMAND +export COLOR_04="#d7af87" # COMMAND_COLOR2 +export COLOR_05="#7fa5bd" # PATH +export COLOR_06="#c79ec4" # SYNTAX_VAR +export COLOR_07="#8adbb4" # PROMP +export COLOR_08="#d0d0d0" # -COLOR_09="#4a4845" # -COLOR_10="#d78787" # COMMAND_ERROR -COLOR_11="#afbea2" # EXEC -COLOR_12="#e4c9af" # -COLOR_13="#a1bdce" # FOLDER -COLOR_14="#d7beda" # -COLOR_15="#b1e7dd" # -COLOR_16="#efefef" # +export COLOR_09="#4a4845" # +export COLOR_10="#d78787" # COMMAND_ERROR +export COLOR_11="#afbea2" # EXEC +export COLOR_12="#e4c9af" # +export COLOR_13="#a1bdce" # FOLDER +export COLOR_14="#d7beda" # +export COLOR_15="#b1e7dd" # +export COLOR_16="#efefef" # -BACKGROUND_COLOR="#1c1c1c" # Background Color -FOREGROUND_COLOR="#d0d0d0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Pnevma" +export BACKGROUND_COLOR="#1c1c1c" # Background Color +export FOREGROUND_COLOR="#d0d0d0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Pnevma" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Pnevma" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/pro.sh b/themes/pro.sh index 2d9ab51..a08ffa9 100755 --- a/themes/pro.sh +++ b/themes/pro.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#990000" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#999900" # COMMAND_COLOR2 -COLOR_05="#2009db" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#990000" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#999900" # COMMAND_COLOR2 +export COLOR_05="#2009db" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#00d900" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#00d900" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#f2f2f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Pro" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#f2f2f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Pro" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Pro" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/red-alert.sh b/themes/red-alert.sh index a4af6f0..60e4fef 100755 --- a/themes/red-alert.sh +++ b/themes/red-alert.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#d62e4e" # SYNTAX_STRING -COLOR_03="#71be6b" # COMMAND -COLOR_04="#beb86b" # COMMAND_COLOR2 -COLOR_05="#489bee" # PATH -COLOR_06="#e979d7" # SYNTAX_VAR -COLOR_07="#6bbeb8" # PROMP -COLOR_08="#d6d6d6" # +export COLOR_01="#000000" # HOST +export COLOR_02="#d62e4e" # SYNTAX_STRING +export COLOR_03="#71be6b" # COMMAND +export COLOR_04="#beb86b" # COMMAND_COLOR2 +export COLOR_05="#489bee" # PATH +export COLOR_06="#e979d7" # SYNTAX_VAR +export COLOR_07="#6bbeb8" # PROMP +export COLOR_08="#d6d6d6" # -COLOR_09="#262626" # -COLOR_10="#e02553" # COMMAND_ERROR -COLOR_11="#aff08c" # EXEC -COLOR_12="#dfddb7" # -COLOR_13="#65aaf1" # FOLDER -COLOR_14="#ddb7df" # -COLOR_15="#b7dfdd" # -COLOR_16="#ffffff" # +export COLOR_09="#262626" # +export COLOR_10="#e02553" # COMMAND_ERROR +export COLOR_11="#aff08c" # EXEC +export COLOR_12="#dfddb7" # +export COLOR_13="#65aaf1" # FOLDER +export COLOR_14="#ddb7df" # +export COLOR_15="#b7dfdd" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#762423" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Red Alert" +export BACKGROUND_COLOR="#762423" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Red Alert" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Red Alert" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/red-sands.sh b/themes/red-sands.sh index cfdcfb7..fafc8b7 100755 --- a/themes/red-sands.sh +++ b/themes/red-sands.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff3f00" # SYNTAX_STRING -COLOR_03="#00bb00" # COMMAND -COLOR_04="#e7b000" # COMMAND_COLOR2 -COLOR_05="#0072ff" # PATH -COLOR_06="#bb00bb" # SYNTAX_VAR -COLOR_07="#00bbbb" # PROMP -COLOR_08="#bbbbbb" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff3f00" # SYNTAX_STRING +export COLOR_03="#00bb00" # COMMAND +export COLOR_04="#e7b000" # COMMAND_COLOR2 +export COLOR_05="#0072ff" # PATH +export COLOR_06="#bb00bb" # SYNTAX_VAR +export COLOR_07="#00bbbb" # PROMP +export COLOR_08="#bbbbbb" # -COLOR_09="#555555" # -COLOR_10="#bb0000" # COMMAND_ERROR -COLOR_11="#00bb00" # EXEC -COLOR_12="#e7b000" # -COLOR_13="#0072ae" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#bb0000" # COMMAND_ERROR +export COLOR_11="#00bb00" # EXEC +export COLOR_12="#e7b000" # +export COLOR_13="#0072ae" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#7a251e" # Background Color -FOREGROUND_COLOR="#d7c9a7" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Red Sands" +export BACKGROUND_COLOR="#7a251e" # Background Color +export FOREGROUND_COLOR="#d7c9a7" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Red Sands" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Red Sands" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/rippedcasts.sh b/themes/rippedcasts.sh index 872cfd4..9ee3d1e 100755 --- a/themes/rippedcasts.sh +++ b/themes/rippedcasts.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#cdaf95" # SYNTAX_STRING -COLOR_03="#a8ff60" # COMMAND -COLOR_04="#bfbb1f" # COMMAND_COLOR2 -COLOR_05="#75a5b0" # PATH -COLOR_06="#ff73fd" # SYNTAX_VAR -COLOR_07="#5a647e" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#cdaf95" # SYNTAX_STRING +export COLOR_03="#a8ff60" # COMMAND +export COLOR_04="#bfbb1f" # COMMAND_COLOR2 +export COLOR_05="#75a5b0" # PATH +export COLOR_06="#ff73fd" # SYNTAX_VAR +export COLOR_07="#5a647e" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#eecbad" # COMMAND_ERROR -COLOR_11="#bcee68" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#86bdc9" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#8c9bc4" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#eecbad" # COMMAND_ERROR +export COLOR_11="#bcee68" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#86bdc9" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#8c9bc4" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#2b2b2b" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Rippedcasts" +export BACKGROUND_COLOR="#2b2b2b" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Rippedcasts" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Rippedcasts" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/royal.sh b/themes/royal.sh index 811589f..2842e26 100755 --- a/themes/royal.sh +++ b/themes/royal.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#241f2b" # HOST -COLOR_02="#91284c" # SYNTAX_STRING -COLOR_03="#23801c" # COMMAND -COLOR_04="#b49d27" # COMMAND_COLOR2 -COLOR_05="#6580b0" # PATH -COLOR_06="#674d96" # SYNTAX_VAR -COLOR_07="#8aaabe" # PROMP -COLOR_08="#524966" # +export COLOR_01="#241f2b" # HOST +export COLOR_02="#91284c" # SYNTAX_STRING +export COLOR_03="#23801c" # COMMAND +export COLOR_04="#b49d27" # COMMAND_COLOR2 +export COLOR_05="#6580b0" # PATH +export COLOR_06="#674d96" # SYNTAX_VAR +export COLOR_07="#8aaabe" # PROMP +export COLOR_08="#524966" # -COLOR_09="#312d3d" # -COLOR_10="#d5356c" # COMMAND_ERROR -COLOR_11="#2cd946" # EXEC -COLOR_12="#fde83b" # -COLOR_13="#90baf9" # FOLDER -COLOR_14="#a479e3" # -COLOR_15="#acd4eb" # -COLOR_16="#9e8cbd" # +export COLOR_09="#312d3d" # +export COLOR_10="#d5356c" # COMMAND_ERROR +export COLOR_11="#2cd946" # EXEC +export COLOR_12="#fde83b" # +export COLOR_13="#90baf9" # FOLDER +export COLOR_14="#a479e3" # +export COLOR_15="#acd4eb" # +export COLOR_16="#9e8cbd" # -BACKGROUND_COLOR="#100815" # Background Color -FOREGROUND_COLOR="#514968" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Royal" +export BACKGROUND_COLOR="#100815" # Background Color +export FOREGROUND_COLOR="#514968" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Royal" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Royal" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/sat.sh b/themes/sat.sh index 495e076..11f43b0 100755 --- a/themes/sat.sh +++ b/themes/sat.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#dd0007" # SYNTAX_STRING -COLOR_03="#07dd00" # COMMAND -COLOR_04="#ddd600" # COMMAND_COLOR2 -COLOR_05="#0007dd" # PATH -COLOR_06="#d600dd" # SYNTAX_VAR -COLOR_07="#00ddd6" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#000000" # HOST +export COLOR_02="#dd0007" # SYNTAX_STRING +export COLOR_03="#07dd00" # COMMAND +export COLOR_04="#ddd600" # COMMAND_COLOR2 +export COLOR_05="#0007dd" # PATH +export COLOR_06="#d600dd" # SYNTAX_VAR +export COLOR_07="#00ddd6" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#7d7d7d" # -COLOR_10="#ff7478" # COMMAND_ERROR -COLOR_11="#78ff74" # EXEC -COLOR_12="#fffa74" # -COLOR_13="#7478ff" # FOLDER -COLOR_14="#fa74ff" # -COLOR_15="#74fffa" # -COLOR_16="#ffffff" # +export COLOR_09="#7d7d7d" # +export COLOR_10="#ff7478" # COMMAND_ERROR +export COLOR_11="#78ff74" # EXEC +export COLOR_12="#fffa74" # +export COLOR_13="#7478ff" # FOLDER +export COLOR_14="#fa74ff" # +export COLOR_15="#74fffa" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#758480" # Background Color -FOREGROUND_COLOR="#23476a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Sat" +export BACKGROUND_COLOR="#758480" # Background Color +export FOREGROUND_COLOR="#23476a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Sat" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Sat" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/sea-shells.sh b/themes/sea-shells.sh index fee5cfc..be5e1de 100755 --- a/themes/sea-shells.sh +++ b/themes/sea-shells.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#17384c" # HOST -COLOR_02="#d15123" # SYNTAX_STRING -COLOR_03="#027c9b" # COMMAND -COLOR_04="#fca02f" # COMMAND_COLOR2 -COLOR_05="#1e4950" # PATH -COLOR_06="#68d4f1" # SYNTAX_VAR -COLOR_07="#50a3b5" # PROMP -COLOR_08="#deb88d" # +export COLOR_01="#17384c" # HOST +export COLOR_02="#d15123" # SYNTAX_STRING +export COLOR_03="#027c9b" # COMMAND +export COLOR_04="#fca02f" # COMMAND_COLOR2 +export COLOR_05="#1e4950" # PATH +export COLOR_06="#68d4f1" # SYNTAX_VAR +export COLOR_07="#50a3b5" # PROMP +export COLOR_08="#deb88d" # -COLOR_09="#434b53" # -COLOR_10="#d48678" # COMMAND_ERROR -COLOR_11="#628d98" # EXEC -COLOR_12="#fdd39f" # -COLOR_13="#1bbcdd" # FOLDER -COLOR_14="#bbe3ee" # -COLOR_15="#87acb4" # -COLOR_16="#fee4ce" # +export COLOR_09="#434b53" # +export COLOR_10="#d48678" # COMMAND_ERROR +export COLOR_11="#628d98" # EXEC +export COLOR_12="#fdd39f" # +export COLOR_13="#1bbcdd" # FOLDER +export COLOR_14="#bbe3ee" # +export COLOR_15="#87acb4" # +export COLOR_16="#fee4ce" # -BACKGROUND_COLOR="#09141b" # Background Color -FOREGROUND_COLOR="#deb88d" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Sea Shells" +export BACKGROUND_COLOR="#09141b" # Background Color +export FOREGROUND_COLOR="#deb88d" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Sea Shells" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Sea Shells" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/seafoam-pastel.sh b/themes/seafoam-pastel.sh index ed005fd..794ca78 100755 --- a/themes/seafoam-pastel.sh +++ b/themes/seafoam-pastel.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#757575" # HOST -COLOR_02="#825d4d" # SYNTAX_STRING -COLOR_03="#728c62" # COMMAND -COLOR_04="#ada16d" # COMMAND_COLOR2 -COLOR_05="#4d7b82" # PATH -COLOR_06="#8a7267" # SYNTAX_VAR -COLOR_07="#729494" # PROMP -COLOR_08="#e0e0e0" # +export COLOR_01="#757575" # HOST +export COLOR_02="#825d4d" # SYNTAX_STRING +export COLOR_03="#728c62" # COMMAND +export COLOR_04="#ada16d" # COMMAND_COLOR2 +export COLOR_05="#4d7b82" # PATH +export COLOR_06="#8a7267" # SYNTAX_VAR +export COLOR_07="#729494" # PROMP +export COLOR_08="#e0e0e0" # -COLOR_09="#8a8a8a" # -COLOR_10="#cf937a" # COMMAND_ERROR -COLOR_11="#98d9aa" # EXEC -COLOR_12="#fae79d" # -COLOR_13="#7ac3cf" # FOLDER -COLOR_14="#d6b2a1" # -COLOR_15="#ade0e0" # -COLOR_16="#e0e0e0" # +export COLOR_09="#8a8a8a" # +export COLOR_10="#cf937a" # COMMAND_ERROR +export COLOR_11="#98d9aa" # EXEC +export COLOR_12="#fae79d" # +export COLOR_13="#7ac3cf" # FOLDER +export COLOR_14="#d6b2a1" # +export COLOR_15="#ade0e0" # +export COLOR_16="#e0e0e0" # -BACKGROUND_COLOR="#243435" # Background Color -FOREGROUND_COLOR="#d4e7d4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Seafoam Pastel" +export BACKGROUND_COLOR="#243435" # Background Color +export FOREGROUND_COLOR="#d4e7d4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Seafoam Pastel" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Seafoam Pastel" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/seti.sh b/themes/seti.sh index a9c2530..7e75f55 100755 --- a/themes/seti.sh +++ b/themes/seti.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#323232" # HOST -COLOR_02="#c22832" # SYNTAX_STRING -COLOR_03="#8ec43d" # COMMAND -COLOR_04="#e0c64f" # COMMAND_COLOR2 -COLOR_05="#43a5d5" # PATH -COLOR_06="#8b57b5" # SYNTAX_VAR -COLOR_07="#8ec43d" # PROMP -COLOR_08="#eeeeee" # +export COLOR_01="#323232" # HOST +export COLOR_02="#c22832" # SYNTAX_STRING +export COLOR_03="#8ec43d" # COMMAND +export COLOR_04="#e0c64f" # COMMAND_COLOR2 +export COLOR_05="#43a5d5" # PATH +export COLOR_06="#8b57b5" # SYNTAX_VAR +export COLOR_07="#8ec43d" # PROMP +export COLOR_08="#eeeeee" # -COLOR_09="#323232" # -COLOR_10="#c22832" # COMMAND_ERROR -COLOR_11="#8ec43d" # EXEC -COLOR_12="#e0c64f" # -COLOR_13="#43a5d5" # FOLDER -COLOR_14="#8b57b5" # -COLOR_15="#8ec43d" # -COLOR_16="#ffffff" # +export COLOR_09="#323232" # +export COLOR_10="#c22832" # COMMAND_ERROR +export COLOR_11="#8ec43d" # EXEC +export COLOR_12="#e0c64f" # +export COLOR_13="#43a5d5" # FOLDER +export COLOR_14="#8b57b5" # +export COLOR_15="#8ec43d" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#111213" # Background Color -FOREGROUND_COLOR="#cacecd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Seti" +export BACKGROUND_COLOR="#111213" # Background Color +export FOREGROUND_COLOR="#cacecd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Seti" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Seti" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/shaman.sh b/themes/shaman.sh index 4995306..5676a4d 100755 --- a/themes/shaman.sh +++ b/themes/shaman.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#012026" # HOST -COLOR_02="#b2302d" # SYNTAX_STRING -COLOR_03="#00a941" # COMMAND -COLOR_04="#5e8baa" # COMMAND_COLOR2 -COLOR_05="#449a86" # PATH -COLOR_06="#00599d" # SYNTAX_VAR -COLOR_07="#5d7e19" # PROMP -COLOR_08="#405555" # +export COLOR_01="#012026" # HOST +export COLOR_02="#b2302d" # SYNTAX_STRING +export COLOR_03="#00a941" # COMMAND +export COLOR_04="#5e8baa" # COMMAND_COLOR2 +export COLOR_05="#449a86" # PATH +export COLOR_06="#00599d" # SYNTAX_VAR +export COLOR_07="#5d7e19" # PROMP +export COLOR_08="#405555" # -COLOR_09="#384451" # -COLOR_10="#ff4242" # COMMAND_ERROR -COLOR_11="#2aea5e" # EXEC -COLOR_12="#8ed4fd" # -COLOR_13="#61d5ba" # FOLDER -COLOR_14="#1298ff" # -COLOR_15="#98d028" # -COLOR_16="#58fbd6" # +export COLOR_09="#384451" # +export COLOR_10="#ff4242" # COMMAND_ERROR +export COLOR_11="#2aea5e" # EXEC +export COLOR_12="#8ed4fd" # +export COLOR_13="#61d5ba" # FOLDER +export COLOR_14="#1298ff" # +export COLOR_15="#98d028" # +export COLOR_16="#58fbd6" # -BACKGROUND_COLOR="#001015" # Background Color -FOREGROUND_COLOR="#405555" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Shaman" +export BACKGROUND_COLOR="#001015" # Background Color +export FOREGROUND_COLOR="#405555" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Shaman" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Shaman" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/shel.sh b/themes/shel.sh index 607b8e3..7a6f41b 100755 --- a/themes/shel.sh +++ b/themes/shel.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2c2423" # HOST -COLOR_02="#ab2463" # SYNTAX_STRING -COLOR_03="#6ca323" # COMMAND -COLOR_04="#ab6423" # COMMAND_COLOR2 -COLOR_05="#2c64a2" # PATH -COLOR_06="#6c24a2" # SYNTAX_VAR -COLOR_07="#2ca363" # PROMP -COLOR_08="#918988" # +export COLOR_01="#2c2423" # HOST +export COLOR_02="#ab2463" # SYNTAX_STRING +export COLOR_03="#6ca323" # COMMAND +export COLOR_04="#ab6423" # COMMAND_COLOR2 +export COLOR_05="#2c64a2" # PATH +export COLOR_06="#6c24a2" # SYNTAX_VAR +export COLOR_07="#2ca363" # PROMP +export COLOR_08="#918988" # -COLOR_09="#918988" # -COLOR_10="#f588b9" # COMMAND_ERROR -COLOR_11="#c2ee86" # EXEC -COLOR_12="#f5ba86" # -COLOR_13="#8fbaec" # FOLDER -COLOR_14="#c288ec" # -COLOR_15="#8feeb9" # -COLOR_16="#f5eeec" # +export COLOR_09="#918988" # +export COLOR_10="#f588b9" # COMMAND_ERROR +export COLOR_11="#c2ee86" # EXEC +export COLOR_12="#f5ba86" # +export COLOR_13="#8fbaec" # FOLDER +export COLOR_14="#c288ec" # +export COLOR_15="#8feeb9" # +export COLOR_16="#f5eeec" # -BACKGROUND_COLOR="#2a201f" # Background Color -FOREGROUND_COLOR="#4882cd" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Shel" +export BACKGROUND_COLOR="#2a201f" # Background Color +export FOREGROUND_COLOR="#4882cd" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Shel" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Shel" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/slate.sh b/themes/slate.sh index 6055fe7..0000e65 100755 --- a/themes/slate.sh +++ b/themes/slate.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#222222" # HOST -COLOR_02="#e2a8bf" # SYNTAX_STRING -COLOR_03="#81d778" # COMMAND -COLOR_04="#c4c9c0" # COMMAND_COLOR2 -COLOR_05="#264b49" # PATH -COLOR_06="#a481d3" # SYNTAX_VAR -COLOR_07="#15ab9c" # PROMP -COLOR_08="#02c5e0" # +export COLOR_01="#222222" # HOST +export COLOR_02="#e2a8bf" # SYNTAX_STRING +export COLOR_03="#81d778" # COMMAND +export COLOR_04="#c4c9c0" # COMMAND_COLOR2 +export COLOR_05="#264b49" # PATH +export COLOR_06="#a481d3" # SYNTAX_VAR +export COLOR_07="#15ab9c" # PROMP +export COLOR_08="#02c5e0" # -COLOR_09="#ffffff" # -COLOR_10="#ffcdd9" # COMMAND_ERROR -COLOR_11="#beffa8" # EXEC -COLOR_12="#d0ccca" # -COLOR_13="#7ab0d2" # FOLDER -COLOR_14="#c5a7d9" # -COLOR_15="#8cdfe0" # -COLOR_16="#e0e0e0" # +export COLOR_09="#ffffff" # +export COLOR_10="#ffcdd9" # COMMAND_ERROR +export COLOR_11="#beffa8" # EXEC +export COLOR_12="#d0ccca" # +export COLOR_13="#7ab0d2" # FOLDER +export COLOR_14="#c5a7d9" # +export COLOR_15="#8cdfe0" # +export COLOR_16="#e0e0e0" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#35b1d2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Slate" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#35b1d2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Slate" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Slate" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/smyck.sh b/themes/smyck.sh index 27c5deb..8cb3d06 100755 --- a/themes/smyck.sh +++ b/themes/smyck.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#C75646" # SYNTAX_STRING -COLOR_03="#8EB33B" # COMMAND -COLOR_04="#D0B03C" # COMMAND_COLOR2 -COLOR_05="#72B3CC" # PATH -COLOR_06="#C8A0D1" # SYNTAX_VAR -COLOR_07="#218693" # PROMP -COLOR_08="#B0B0B0" # +export COLOR_01="#000000" # HOST +export COLOR_02="#C75646" # SYNTAX_STRING +export COLOR_03="#8EB33B" # COMMAND +export COLOR_04="#D0B03C" # COMMAND_COLOR2 +export COLOR_05="#72B3CC" # PATH +export COLOR_06="#C8A0D1" # SYNTAX_VAR +export COLOR_07="#218693" # PROMP +export COLOR_08="#B0B0B0" # -COLOR_09="#5D5D5D" # -COLOR_10="#E09690" # COMMAND_ERROR -COLOR_11="#CDEE69" # EXEC -COLOR_12="#FFE377" # -COLOR_13="#9CD9F0" # FOLDER -COLOR_14="#FBB1F9" # -COLOR_15="#77DFD8" # -COLOR_16="#F7F7F7" # +export COLOR_09="#5D5D5D" # +export COLOR_10="#E09690" # COMMAND_ERROR +export COLOR_11="#CDEE69" # EXEC +export COLOR_12="#FFE377" # +export COLOR_13="#9CD9F0" # FOLDER +export COLOR_14="#FBB1F9" # +export COLOR_15="#77DFD8" # +export COLOR_16="#F7F7F7" # -BACKGROUND_COLOR="#242424" # Background Color -FOREGROUND_COLOR="#F7F7F7" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Smyck" +export BACKGROUND_COLOR="#242424" # Background Color +export FOREGROUND_COLOR="#F7F7F7" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Smyck" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Smyck" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/snazzy.sh b/themes/snazzy.sh index aff7eab..5fde346 100755 --- a/themes/snazzy.sh +++ b/themes/snazzy.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#282A36" -COLOR_02="#FF5C57" -COLOR_03="#5AF78E" -COLOR_04="#F3F99D" -COLOR_05="#57C7FF" -COLOR_06="#FF6AC1" -COLOR_07="#9AEDFE" -COLOR_08="#F1F1F0" +export COLOR_01="#282A36" +export COLOR_02="#FF5C57" +export COLOR_03="#5AF78E" +export COLOR_04="#F3F99D" +export COLOR_05="#57C7FF" +export COLOR_06="#FF6AC1" +export COLOR_07="#9AEDFE" +export COLOR_08="#F1F1F0" -COLOR_09="#686868" -COLOR_10="$COLOR_02" -COLOR_11="$COLOR_03" -COLOR_12="$COLOR_04" -COLOR_13="$COLOR_05" -COLOR_14="$COLOR_06" -COLOR_15="$COLOR_07" -COLOR_16="#EFF0EB" +export COLOR_09="#686868" +export COLOR_10="$COLOR_02" +export COLOR_11="$COLOR_03" +export COLOR_12="$COLOR_04" +export COLOR_13="$COLOR_05" +export COLOR_14="$COLOR_06" +export COLOR_15="$COLOR_07" +export COLOR_16="#EFF0EB" -BACKGROUND_COLOR="$COLOR_01" -FOREGROUND_COLOR="$COLOR_16" -CURSOR_COLOR="#97979B" -PROFILE_NAME="Snazzy" +export BACKGROUND_COLOR="$COLOR_01" +export FOREGROUND_COLOR="$COLOR_16" +export CURSOR_COLOR="#97979B" +export PROFILE_NAME="Snazzy" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Snazzy" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/soft-server.sh b/themes/soft-server.sh index 029abe9..72020d9 100755 --- a/themes/soft-server.sh +++ b/themes/soft-server.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#a2686a" # SYNTAX_STRING -COLOR_03="#9aa56a" # COMMAND -COLOR_04="#a3906a" # COMMAND_COLOR2 -COLOR_05="#6b8fa3" # PATH -COLOR_06="#6a71a3" # SYNTAX_VAR -COLOR_07="#6ba58f" # PROMP -COLOR_08="#99a3a2" # +export COLOR_01="#000000" # HOST +export COLOR_02="#a2686a" # SYNTAX_STRING +export COLOR_03="#9aa56a" # COMMAND +export COLOR_04="#a3906a" # COMMAND_COLOR2 +export COLOR_05="#6b8fa3" # PATH +export COLOR_06="#6a71a3" # SYNTAX_VAR +export COLOR_07="#6ba58f" # PROMP +export COLOR_08="#99a3a2" # -COLOR_09="#666c6c" # -COLOR_10="#dd5c60" # COMMAND_ERROR -COLOR_11="#bfdf55" # EXEC -COLOR_12="#deb360" # -COLOR_13="#62b1df" # FOLDER -COLOR_14="#606edf" # -COLOR_15="#64e39c" # -COLOR_16="#d2e0de" # +export COLOR_09="#666c6c" # +export COLOR_10="#dd5c60" # COMMAND_ERROR +export COLOR_11="#bfdf55" # EXEC +export COLOR_12="#deb360" # +export COLOR_13="#62b1df" # FOLDER +export COLOR_14="#606edf" # +export COLOR_15="#64e39c" # +export COLOR_16="#d2e0de" # -BACKGROUND_COLOR="#242626" # Background Color -FOREGROUND_COLOR="#99a3a2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Soft Server" +export BACKGROUND_COLOR="#242626" # Background Color +export FOREGROUND_COLOR="#99a3a2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Soft Server" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Soft Server" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/solarized-darcula.sh b/themes/solarized-darcula.sh index d29565d..fab6d7a 100755 --- a/themes/solarized-darcula.sh +++ b/themes/solarized-darcula.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#25292a" # HOST -COLOR_02="#f24840" # SYNTAX_STRING -COLOR_03="#629655" # COMMAND -COLOR_04="#b68800" # COMMAND_COLOR2 -COLOR_05="#2075c7" # PATH -COLOR_06="#797fd4" # SYNTAX_VAR -COLOR_07="#15968d" # PROMP -COLOR_08="#d2d8d9" # +export COLOR_01="#25292a" # HOST +export COLOR_02="#f24840" # SYNTAX_STRING +export COLOR_03="#629655" # COMMAND +export COLOR_04="#b68800" # COMMAND_COLOR2 +export COLOR_05="#2075c7" # PATH +export COLOR_06="#797fd4" # SYNTAX_VAR +export COLOR_07="#15968d" # PROMP +export COLOR_08="#d2d8d9" # -COLOR_09="#25292a" # -COLOR_10="#f24840" # COMMAND_ERROR -COLOR_11="#629655" # EXEC -COLOR_12="#b68800" # -COLOR_13="#2075c7" # FOLDER -COLOR_14="#797fd4" # -COLOR_15="#15968d" # -COLOR_16="#d2d8d9" # +export COLOR_09="#25292a" # +export COLOR_10="#f24840" # COMMAND_ERROR +export COLOR_11="#629655" # EXEC +export COLOR_12="#b68800" # +export COLOR_13="#2075c7" # FOLDER +export COLOR_14="#797fd4" # +export COLOR_15="#15968d" # +export COLOR_16="#d2d8d9" # -BACKGROUND_COLOR="#3d3f41" # Background Color -FOREGROUND_COLOR="#d2d8d9" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Solarized Darcula" +export BACKGROUND_COLOR="#3d3f41" # Background Color +export FOREGROUND_COLOR="#d2d8d9" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Solarized Darcula" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Solarized Darcula" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/solarized-dark-higher-contrast.sh b/themes/solarized-dark-higher-contrast.sh index 5536361..5b2ed39 100755 --- a/themes/solarized-dark-higher-contrast.sh +++ b/themes/solarized-dark-higher-contrast.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#002831" # HOST -COLOR_02="#d11c24" # SYNTAX_STRING -COLOR_03="#6cbe6c" # COMMAND -COLOR_04="#a57706" # COMMAND_COLOR2 -COLOR_05="#2176c7" # PATH -COLOR_06="#c61c6f" # SYNTAX_VAR -COLOR_07="#259286" # PROMP -COLOR_08="#eae3cb" # +export COLOR_01="#002831" # HOST +export COLOR_02="#d11c24" # SYNTAX_STRING +export COLOR_03="#6cbe6c" # COMMAND +export COLOR_04="#a57706" # COMMAND_COLOR2 +export COLOR_05="#2176c7" # PATH +export COLOR_06="#c61c6f" # SYNTAX_VAR +export COLOR_07="#259286" # PROMP +export COLOR_08="#eae3cb" # -COLOR_09="#006488" # -COLOR_10="#f5163b" # COMMAND_ERROR -COLOR_11="#51ef84" # EXEC -COLOR_12="#b27e28" # -COLOR_13="#178ec8" # FOLDER -COLOR_14="#e24d8e" # -COLOR_15="#00b39e" # -COLOR_16="#fcf4dc" # +export COLOR_09="#006488" # +export COLOR_10="#f5163b" # COMMAND_ERROR +export COLOR_11="#51ef84" # EXEC +export COLOR_12="#b27e28" # +export COLOR_13="#178ec8" # FOLDER +export COLOR_14="#e24d8e" # +export COLOR_15="#00b39e" # +export COLOR_16="#fcf4dc" # -BACKGROUND_COLOR="#001e27" # Background Color -FOREGROUND_COLOR="#9cc2c3" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Solarized Dark Higher Contrast" +export BACKGROUND_COLOR="#001e27" # Background Color +export FOREGROUND_COLOR="#9cc2c3" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Solarized Dark Higher Contrast" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Solarized Dark Higher Contrast" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/solarized-dark.sh b/themes/solarized-dark.sh index b049106..c119c3d 100755 --- a/themes/solarized-dark.sh +++ b/themes/solarized-dark.sh @@ -1,29 +1,29 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#073642" # HOST -COLOR_02="#DC322F" # SYNTAX_STRING -COLOR_03="#859900" # COMMAND -COLOR_04="#CF9A6B" # COMMAND_COLOR2 -COLOR_05="#268BD2" # PATH -COLOR_06="#D33682" # SYNTAX_VAR -COLOR_07="#2AA198" # PROMP -COLOR_08="#EEE8D5" # +export COLOR_01="#073642" # HOST +export COLOR_02="#DC322F" # SYNTAX_STRING +export COLOR_03="#859900" # COMMAND +export COLOR_04="#CF9A6B" # COMMAND_COLOR2 +export COLOR_05="#268BD2" # PATH +export COLOR_06="#D33682" # SYNTAX_VAR +export COLOR_07="#2AA198" # PROMP +export COLOR_08="#EEE8D5" # -COLOR_09="#657B83" # -COLOR_10="#D87979" # COMMAND_ERROR -COLOR_11="#88CF76" # EXEC -COLOR_12="#657B83" # -COLOR_13="#2699FF" # FOLDER -COLOR_14="#D33682" # -COLOR_15="#43B8C3" # -COLOR_16="#FDF6E3" # +export COLOR_09="#657B83" # +export COLOR_10="#D87979" # COMMAND_ERROR +export COLOR_11="#88CF76" # EXEC +export COLOR_12="#657B83" # +export COLOR_13="#2699FF" # FOLDER +export COLOR_14="#D33682" # +export COLOR_15="#43B8C3" # +export COLOR_16="#FDF6E3" # -BACKGROUND_COLOR="#002B36" # Background Color -FOREGROUND_COLOR="#839496" # Text +export BACKGROUND_COLOR="#002B36" # Background Color +export FOREGROUND_COLOR="#839496" # Text BOLD_COLOR="#93A1A1" # Bold -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Solarized Dark" +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Solarized Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Solarized Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/solarized-light.sh b/themes/solarized-light.sh index d8a7d31..d14e56c 100755 --- a/themes/solarized-light.sh +++ b/themes/solarized-light.sh @@ -1,29 +1,29 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#073642" # HOST -COLOR_02="#DC322F" # SYNTAX_STRING -COLOR_03="#859900" # COMMAND -COLOR_04="#B58900" # COMMAND_COLOR2 -COLOR_05="#268BD2" # PATH -COLOR_06="#D33682" # SYNTAX_VAR -COLOR_07="#2AA198" # PROMP -COLOR_08="#EEE8D5" # +export COLOR_01="#073642" # HOST +export COLOR_02="#DC322F" # SYNTAX_STRING +export COLOR_03="#859900" # COMMAND +export COLOR_04="#B58900" # COMMAND_COLOR2 +export COLOR_05="#268BD2" # PATH +export COLOR_06="#D33682" # SYNTAX_VAR +export COLOR_07="#2AA198" # PROMP +export COLOR_08="#EEE8D5" # -COLOR_09="#002B36" # -COLOR_10="#CB4B16" # COMMAND_ERROR -COLOR_11="#586E75" # EXEC -COLOR_12="#657B83" # -COLOR_13="#839496" # FOLDER -COLOR_14="#6C71C4" # -COLOR_15="#93A1A1" # -COLOR_16="#FDF6E3" # +export COLOR_09="#002B36" # +export COLOR_10="#CB4B16" # COMMAND_ERROR +export COLOR_11="#586E75" # EXEC +export COLOR_12="#657B83" # +export COLOR_13="#839496" # FOLDER +export COLOR_14="#6C71C4" # +export COLOR_15="#93A1A1" # +export COLOR_16="#FDF6E3" # -BACKGROUND_COLOR="#FDF6E3" # Background Color -FOREGROUND_COLOR="#657B83" # Text +export BACKGROUND_COLOR="#FDF6E3" # Background Color +export FOREGROUND_COLOR="#657B83" # Text BOLD_COLOR="#586E75" # Bold -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Solarized Light" +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Solarized Light" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Solarized Light" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/spacedust.sh b/themes/spacedust.sh index cdcbe63..e7127e9 100755 --- a/themes/spacedust.sh +++ b/themes/spacedust.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#6e5346" # HOST -COLOR_02="#e35b00" # SYNTAX_STRING -COLOR_03="#5cab96" # COMMAND -COLOR_04="#e3cd7b" # COMMAND_COLOR2 -COLOR_05="#0f548b" # PATH -COLOR_06="#e35b00" # SYNTAX_VAR -COLOR_07="#06afc7" # PROMP -COLOR_08="#f0f1ce" # +export COLOR_01="#6e5346" # HOST +export COLOR_02="#e35b00" # SYNTAX_STRING +export COLOR_03="#5cab96" # COMMAND +export COLOR_04="#e3cd7b" # COMMAND_COLOR2 +export COLOR_05="#0f548b" # PATH +export COLOR_06="#e35b00" # SYNTAX_VAR +export COLOR_07="#06afc7" # PROMP +export COLOR_08="#f0f1ce" # -COLOR_09="#684c31" # -COLOR_10="#ff8a3a" # COMMAND_ERROR -COLOR_11="#aecab8" # EXEC -COLOR_12="#ffc878" # -COLOR_13="#67a0ce" # FOLDER -COLOR_14="#ff8a3a" # -COLOR_15="#83a7b4" # -COLOR_16="#fefff1" # +export COLOR_09="#684c31" # +export COLOR_10="#ff8a3a" # COMMAND_ERROR +export COLOR_11="#aecab8" # EXEC +export COLOR_12="#ffc878" # +export COLOR_13="#67a0ce" # FOLDER +export COLOR_14="#ff8a3a" # +export COLOR_15="#83a7b4" # +export COLOR_16="#fefff1" # -BACKGROUND_COLOR="#0a1e24" # Background Color -FOREGROUND_COLOR="#ecf0c1" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Spacedust" +export BACKGROUND_COLOR="#0a1e24" # Background Color +export FOREGROUND_COLOR="#ecf0c1" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Spacedust" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Spacedust" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/spacegray-eighties-dull.sh b/themes/spacegray-eighties-dull.sh index dae6b64..5324aac 100755 --- a/themes/spacegray-eighties-dull.sh +++ b/themes/spacegray-eighties-dull.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#15171c" # HOST -COLOR_02="#b24a56" # SYNTAX_STRING -COLOR_03="#92b477" # COMMAND -COLOR_04="#c6735a" # COMMAND_COLOR2 -COLOR_05="#7c8fa5" # PATH -COLOR_06="#a5789e" # SYNTAX_VAR -COLOR_07="#80cdcb" # PROMP -COLOR_08="#b3b8c3" # +export COLOR_01="#15171c" # HOST +export COLOR_02="#b24a56" # SYNTAX_STRING +export COLOR_03="#92b477" # COMMAND +export COLOR_04="#c6735a" # COMMAND_COLOR2 +export COLOR_05="#7c8fa5" # PATH +export COLOR_06="#a5789e" # SYNTAX_VAR +export COLOR_07="#80cdcb" # PROMP +export COLOR_08="#b3b8c3" # -COLOR_09="#555555" # -COLOR_10="#ec5f67" # COMMAND_ERROR -COLOR_11="#89e986" # EXEC -COLOR_12="#fec254" # -COLOR_13="#5486c0" # FOLDER -COLOR_14="#bf83c1" # -COLOR_15="#58c2c1" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ec5f67" # COMMAND_ERROR +export COLOR_11="#89e986" # EXEC +export COLOR_12="#fec254" # +export COLOR_13="#5486c0" # FOLDER +export COLOR_14="#bf83c1" # +export COLOR_15="#58c2c1" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#c9c6bc" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="SpaceGray Eighties Dull" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#c9c6bc" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="SpaceGray Eighties Dull" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="SpaceGray Eighties Dull" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/spacegray-eighties.sh b/themes/spacegray-eighties.sh index 2c8e255..1e2c97b 100755 --- a/themes/spacegray-eighties.sh +++ b/themes/spacegray-eighties.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#15171c" # HOST -COLOR_02="#ec5f67" # SYNTAX_STRING -COLOR_03="#81a764" # COMMAND -COLOR_04="#fec254" # COMMAND_COLOR2 -COLOR_05="#5486c0" # PATH -COLOR_06="#bf83c1" # SYNTAX_VAR -COLOR_07="#57c2c1" # PROMP -COLOR_08="#efece7" # +export COLOR_01="#15171c" # HOST +export COLOR_02="#ec5f67" # SYNTAX_STRING +export COLOR_03="#81a764" # COMMAND +export COLOR_04="#fec254" # COMMAND_COLOR2 +export COLOR_05="#5486c0" # PATH +export COLOR_06="#bf83c1" # SYNTAX_VAR +export COLOR_07="#57c2c1" # PROMP +export COLOR_08="#efece7" # -COLOR_09="#555555" # -COLOR_10="#ff6973" # COMMAND_ERROR -COLOR_11="#93d493" # EXEC -COLOR_12="#ffd256" # -COLOR_13="#4d84d1" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#83e9e4" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff6973" # COMMAND_ERROR +export COLOR_11="#93d493" # EXEC +export COLOR_12="#ffd256" # +export COLOR_13="#4d84d1" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#83e9e4" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#222222" # Background Color -FOREGROUND_COLOR="#bdbaae" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="SpaceGray Eighties" +export BACKGROUND_COLOR="#222222" # Background Color +export FOREGROUND_COLOR="#bdbaae" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="SpaceGray Eighties" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="SpaceGray Eighties" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/spacegray.sh b/themes/spacegray.sh index 3bbe11b..fde4b47 100755 --- a/themes/spacegray.sh +++ b/themes/spacegray.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b04b57" # SYNTAX_STRING -COLOR_03="#87b379" # COMMAND -COLOR_04="#e5c179" # COMMAND_COLOR2 -COLOR_05="#7d8fa4" # PATH -COLOR_06="#a47996" # SYNTAX_VAR -COLOR_07="#85a7a5" # PROMP -COLOR_08="#b3b8c3" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b04b57" # SYNTAX_STRING +export COLOR_03="#87b379" # COMMAND +export COLOR_04="#e5c179" # COMMAND_COLOR2 +export COLOR_05="#7d8fa4" # PATH +export COLOR_06="#a47996" # SYNTAX_VAR +export COLOR_07="#85a7a5" # PROMP +export COLOR_08="#b3b8c3" # -COLOR_09="#000000" # -COLOR_10="#b04b57" # COMMAND_ERROR -COLOR_11="#87b379" # EXEC -COLOR_12="#e5c179" # -COLOR_13="#7d8fa4" # FOLDER -COLOR_14="#a47996" # -COLOR_15="#85a7a5" # -COLOR_16="#ffffff" # +export COLOR_09="#000000" # +export COLOR_10="#b04b57" # COMMAND_ERROR +export COLOR_11="#87b379" # EXEC +export COLOR_12="#e5c179" # +export COLOR_13="#7d8fa4" # FOLDER +export COLOR_14="#a47996" # +export COLOR_15="#85a7a5" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#20242d" # Background Color -FOREGROUND_COLOR="#b3b8c3" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="SpaceGray" +export BACKGROUND_COLOR="#20242d" # Background Color +export FOREGROUND_COLOR="#b3b8c3" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="SpaceGray" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="SpaceGray" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/spring.sh b/themes/spring.sh index 8318c26..694bcc0 100755 --- a/themes/spring.sh +++ b/themes/spring.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff4d83" # SYNTAX_STRING -COLOR_03="#1f8c3b" # COMMAND -COLOR_04="#1fc95b" # COMMAND_COLOR2 -COLOR_05="#1dd3ee" # PATH -COLOR_06="#8959a8" # SYNTAX_VAR -COLOR_07="#3e999f" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff4d83" # SYNTAX_STRING +export COLOR_03="#1f8c3b" # COMMAND +export COLOR_04="#1fc95b" # COMMAND_COLOR2 +export COLOR_05="#1dd3ee" # PATH +export COLOR_06="#8959a8" # SYNTAX_VAR +export COLOR_07="#3e999f" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#000000" # -COLOR_10="#ff0021" # COMMAND_ERROR -COLOR_11="#1fc231" # EXEC -COLOR_12="#d5b807" # -COLOR_13="#15a9fd" # FOLDER -COLOR_14="#8959a8" # -COLOR_15="#3e999f" # -COLOR_16="#ffffff" # +export COLOR_09="#000000" # +export COLOR_10="#ff0021" # COMMAND_ERROR +export COLOR_11="#1fc231" # EXEC +export COLOR_12="#d5b807" # +export COLOR_13="#15a9fd" # FOLDER +export COLOR_14="#8959a8" # +export COLOR_15="#3e999f" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#0a1e24" # Background Color -FOREGROUND_COLOR="#ecf0c1" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Spring" +export BACKGROUND_COLOR="#0a1e24" # Background Color +export FOREGROUND_COLOR="#ecf0c1" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Spring" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Spring" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/square.sh b/themes/square.sh index 1137633..52776ee 100755 --- a/themes/square.sh +++ b/themes/square.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#050505" # HOST -COLOR_02="#e9897c" # SYNTAX_STRING -COLOR_03="#b6377d" # COMMAND -COLOR_04="#ecebbe" # COMMAND_COLOR2 -COLOR_05="#a9cdeb" # PATH -COLOR_06="#75507b" # SYNTAX_VAR -COLOR_07="#c9caec" # PROMP -COLOR_08="#f2f2f2" # +export COLOR_01="#050505" # HOST +export COLOR_02="#e9897c" # SYNTAX_STRING +export COLOR_03="#b6377d" # COMMAND +export COLOR_04="#ecebbe" # COMMAND_COLOR2 +export COLOR_05="#a9cdeb" # PATH +export COLOR_06="#75507b" # SYNTAX_VAR +export COLOR_07="#c9caec" # PROMP +export COLOR_08="#f2f2f2" # -COLOR_09="#141414" # -COLOR_10="#f99286" # COMMAND_ERROR -COLOR_11="#c3f786" # EXEC -COLOR_12="#fcfbcc" # -COLOR_13="#b6defb" # FOLDER -COLOR_14="#ad7fa8" # -COLOR_15="#d7d9fc" # -COLOR_16="#e2e2e2" # +export COLOR_09="#141414" # +export COLOR_10="#f99286" # COMMAND_ERROR +export COLOR_11="#c3f786" # EXEC +export COLOR_12="#fcfbcc" # +export COLOR_13="#b6defb" # FOLDER +export COLOR_14="#ad7fa8" # +export COLOR_15="#d7d9fc" # +export COLOR_16="#e2e2e2" # -BACKGROUND_COLOR="#0a1e24" # Background Color -FOREGROUND_COLOR="#1a1a1a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Square" +export BACKGROUND_COLOR="#0a1e24" # Background Color +export FOREGROUND_COLOR="#1a1a1a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Square" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Square" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/srcery.sh b/themes/srcery.sh index 49c9924..b2806f6 100755 --- a/themes/srcery.sh +++ b/themes/srcery.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1C1B19" # HOST -COLOR_02="#FF3128" # SYNTAX_STRING -COLOR_03="#519F50" # COMMAND -COLOR_04="#FBB829" # COMMAND_COLOR2 -COLOR_05="#5573A3" # PATH -COLOR_06="#E02C6D" # SYNTAX_VAR -COLOR_07="#0AAEB3" # PROMP -COLOR_08="#918175" # +export COLOR_01="#1C1B19" # HOST +export COLOR_02="#FF3128" # SYNTAX_STRING +export COLOR_03="#519F50" # COMMAND +export COLOR_04="#FBB829" # COMMAND_COLOR2 +export COLOR_05="#5573A3" # PATH +export COLOR_06="#E02C6D" # SYNTAX_VAR +export COLOR_07="#0AAEB3" # PROMP +export COLOR_08="#918175" # -COLOR_09="#2D2B28" # -COLOR_10="#F75341" # COMMAND_ERROR -COLOR_11="#98BC37" # EXEC -COLOR_12="#FED06E" # -COLOR_13="#8EB2F7" # FOLDER -COLOR_14="#E35682" # -COLOR_15="#53FDE9" # -COLOR_16="#FCE8C3" # +export COLOR_09="#2D2B28" # +export COLOR_10="#F75341" # COMMAND_ERROR +export COLOR_11="#98BC37" # EXEC +export COLOR_12="#FED06E" # +export COLOR_13="#8EB2F7" # FOLDER +export COLOR_14="#E35682" # +export COLOR_15="#53FDE9" # +export COLOR_16="#FCE8C3" # -BACKGROUND_COLOR="#282828" # Background Color -FOREGROUND_COLOR="#ebdbb2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Srcery" +export BACKGROUND_COLOR="#282828" # Background Color +export FOREGROUND_COLOR="#ebdbb2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Srcery" # ============================================= @@ -34,22 +34,21 @@ PROFILE_NAME="Srcery" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/sundried.sh b/themes/sundried.sh index 383bc3d..380b45d 100755 --- a/themes/sundried.sh +++ b/themes/sundried.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#302b2a" # HOST -COLOR_02="#a7463d" # SYNTAX_STRING -COLOR_03="#587744" # COMMAND -COLOR_04="#9d602a" # COMMAND_COLOR2 -COLOR_05="#485b98" # PATH -COLOR_06="#864651" # SYNTAX_VAR -COLOR_07="#9c814f" # PROMP -COLOR_08="#c9c9c9" # +export COLOR_01="#302b2a" # HOST +export COLOR_02="#a7463d" # SYNTAX_STRING +export COLOR_03="#587744" # COMMAND +export COLOR_04="#9d602a" # COMMAND_COLOR2 +export COLOR_05="#485b98" # PATH +export COLOR_06="#864651" # SYNTAX_VAR +export COLOR_07="#9c814f" # PROMP +export COLOR_08="#c9c9c9" # -COLOR_09="#4d4e48" # -COLOR_10="#aa000c" # COMMAND_ERROR -COLOR_11="#128c21" # EXEC -COLOR_12="#fc6a21" # -COLOR_13="#7999f7" # FOLDER -COLOR_14="#fd8aa1" # -COLOR_15="#fad484" # -COLOR_16="#ffffff" # +export COLOR_09="#4d4e48" # +export COLOR_10="#aa000c" # COMMAND_ERROR +export COLOR_11="#128c21" # EXEC +export COLOR_12="#fc6a21" # +export COLOR_13="#7999f7" # FOLDER +export COLOR_14="#fd8aa1" # +export COLOR_15="#fad484" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#1a1818" # Background Color -FOREGROUND_COLOR="#c9c9c9" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Sundried" +export BACKGROUND_COLOR="#1a1818" # Background Color +export FOREGROUND_COLOR="#c9c9c9" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Sundried" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Sundried" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/symphonic.sh b/themes/symphonic.sh index c830421..379fef5 100755 --- a/themes/symphonic.sh +++ b/themes/symphonic.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#dc322f" # SYNTAX_STRING -COLOR_03="#56db3a" # COMMAND -COLOR_04="#ff8400" # COMMAND_COLOR2 -COLOR_05="#0084d4" # PATH -COLOR_06="#b729d9" # SYNTAX_VAR -COLOR_07="#ccccff" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#000000" # HOST +export COLOR_02="#dc322f" # SYNTAX_STRING +export COLOR_03="#56db3a" # COMMAND +export COLOR_04="#ff8400" # COMMAND_COLOR2 +export COLOR_05="#0084d4" # PATH +export COLOR_06="#b729d9" # SYNTAX_VAR +export COLOR_07="#ccccff" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#1b1d21" # -COLOR_10="#dc322f" # COMMAND_ERROR -COLOR_11="#56db3a" # EXEC -COLOR_12="#ff8400" # -COLOR_13="#0084d4" # FOLDER -COLOR_14="#b729d9" # -COLOR_15="#ccccff" # -COLOR_16="#ffffff" # +export COLOR_09="#1b1d21" # +export COLOR_10="#dc322f" # COMMAND_ERROR +export COLOR_11="#56db3a" # EXEC +export COLOR_12="#ff8400" # +export COLOR_13="#0084d4" # FOLDER +export COLOR_14="#b729d9" # +export COLOR_15="#ccccff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Symphonic" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Symphonic" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Symphonic" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/teerb.sh b/themes/teerb.sh index 6a644be..9b8c6c0 100755 --- a/themes/teerb.sh +++ b/themes/teerb.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1c1c1c" # HOST -COLOR_02="#d68686" # SYNTAX_STRING -COLOR_03="#aed686" # COMMAND -COLOR_04="#d7af87" # COMMAND_COLOR2 -COLOR_05="#86aed6" # PATH -COLOR_06="#d6aed6" # SYNTAX_VAR -COLOR_07="#8adbb4" # PROMP -COLOR_08="#d0d0d0" # +export COLOR_01="#1c1c1c" # HOST +export COLOR_02="#d68686" # SYNTAX_STRING +export COLOR_03="#aed686" # COMMAND +export COLOR_04="#d7af87" # COMMAND_COLOR2 +export COLOR_05="#86aed6" # PATH +export COLOR_06="#d6aed6" # SYNTAX_VAR +export COLOR_07="#8adbb4" # PROMP +export COLOR_08="#d0d0d0" # -COLOR_09="#1c1c1c" # -COLOR_10="#d68686" # COMMAND_ERROR -COLOR_11="#aed686" # EXEC -COLOR_12="#e4c9af" # -COLOR_13="#86aed6" # FOLDER -COLOR_14="#d6aed6" # -COLOR_15="#b1e7dd" # -COLOR_16="#efefef" # +export COLOR_09="#1c1c1c" # +export COLOR_10="#d68686" # COMMAND_ERROR +export COLOR_11="#aed686" # EXEC +export COLOR_12="#e4c9af" # +export COLOR_13="#86aed6" # FOLDER +export COLOR_14="#d6aed6" # +export COLOR_15="#b1e7dd" # +export COLOR_16="#efefef" # -BACKGROUND_COLOR="#262626" # Background Color -FOREGROUND_COLOR="#d0d0d0" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Teerb" +export BACKGROUND_COLOR="#262626" # Background Color +export FOREGROUND_COLOR="#d0d0d0" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Teerb" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Teerb" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/terminal-basic.sh b/themes/terminal-basic.sh index 7570674..7807534 100755 --- a/themes/terminal-basic.sh +++ b/themes/terminal-basic.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#990000" # SYNTAX_STRING -COLOR_03="#00a600" # COMMAND -COLOR_04="#999900" # COMMAND_COLOR2 -COLOR_05="#0000b2" # PATH -COLOR_06="#b200b2" # SYNTAX_VAR -COLOR_07="#00a6b2" # PROMP -COLOR_08="#bfbfbf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#990000" # SYNTAX_STRING +export COLOR_03="#00a600" # COMMAND +export COLOR_04="#999900" # COMMAND_COLOR2 +export COLOR_05="#0000b2" # PATH +export COLOR_06="#b200b2" # SYNTAX_VAR +export COLOR_07="#00a6b2" # PROMP +export COLOR_08="#bfbfbf" # -COLOR_09="#666666" # -COLOR_10="#e50000" # COMMAND_ERROR -COLOR_11="#00d900" # EXEC -COLOR_12="#e5e500" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#e500e5" # -COLOR_15="#00e5e5" # -COLOR_16="#e5e5e5" # +export COLOR_09="#666666" # +export COLOR_10="#e50000" # COMMAND_ERROR +export COLOR_11="#00d900" # EXEC +export COLOR_12="#e5e500" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#e500e5" # +export COLOR_15="#00e5e5" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#ffffff" # Background Color -FOREGROUND_COLOR="#000000" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Terminal Basic" +export BACKGROUND_COLOR="#ffffff" # Background Color +export FOREGROUND_COLOR="#000000" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Terminal Basic" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Terminal Basic" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/terminix-dark.sh b/themes/terminix-dark.sh index 7c5f885..53264f1 100755 --- a/themes/terminix-dark.sh +++ b/themes/terminix-dark.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#282a2e" # HOST -COLOR_02="#a54242" # SYNTAX_STRING -COLOR_03="#a1b56c" # COMMAND -COLOR_04="#de935f" # COMMAND_COLOR2 -COLOR_05="#225555" # PATH -COLOR_06="#85678f" # SYNTAX_VAR -COLOR_07="#5e8d87" # PROMP -COLOR_08="#777777" # +export COLOR_01="#282a2e" # HOST +export COLOR_02="#a54242" # SYNTAX_STRING +export COLOR_03="#a1b56c" # COMMAND +export COLOR_04="#de935f" # COMMAND_COLOR2 +export COLOR_05="#225555" # PATH +export COLOR_06="#85678f" # SYNTAX_VAR +export COLOR_07="#5e8d87" # PROMP +export COLOR_08="#777777" # -COLOR_09="#373b41" # -COLOR_10="#c63535" # COMMAND_ERROR -COLOR_11="#608360" # EXEC -COLOR_12="#fa805a" # -COLOR_13="#449da1" # FOLDER -COLOR_14="#ba8baf" # -COLOR_15="#86c1b9" # -COLOR_16="#c5c8c6" # +export COLOR_09="#373b41" # +export COLOR_10="#c63535" # COMMAND_ERROR +export COLOR_11="#608360" # EXEC +export COLOR_12="#fa805a" # +export COLOR_13="#449da1" # FOLDER +export COLOR_14="#ba8baf" # +export COLOR_15="#86c1b9" # +export COLOR_16="#c5c8c6" # -BACKGROUND_COLOR="#091116" # Background Color -FOREGROUND_COLOR="#868A8C" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Terminix Dark" +export BACKGROUND_COLOR="#091116" # Background Color +export FOREGROUND_COLOR="#868A8C" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Terminix Dark" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Terminix Dark" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/thayer-bright.sh b/themes/thayer-bright.sh index a764e58..52880c2 100755 --- a/themes/thayer-bright.sh +++ b/themes/thayer-bright.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#1b1d1e" # HOST -COLOR_02="#f92672" # SYNTAX_STRING -COLOR_03="#4df840" # COMMAND -COLOR_04="#f4fd22" # COMMAND_COLOR2 -COLOR_05="#2757d6" # PATH -COLOR_06="#8c54fe" # SYNTAX_VAR -COLOR_07="#38c8b5" # PROMP -COLOR_08="#ccccc6" # +export COLOR_01="#1b1d1e" # HOST +export COLOR_02="#f92672" # SYNTAX_STRING +export COLOR_03="#4df840" # COMMAND +export COLOR_04="#f4fd22" # COMMAND_COLOR2 +export COLOR_05="#2757d6" # PATH +export COLOR_06="#8c54fe" # SYNTAX_VAR +export COLOR_07="#38c8b5" # PROMP +export COLOR_08="#ccccc6" # -COLOR_09="#505354" # -COLOR_10="#ff5995" # COMMAND_ERROR -COLOR_11="#b6e354" # EXEC -COLOR_12="#feed6c" # -COLOR_13="#3f78ff" # FOLDER -COLOR_14="#9e6ffe" # -COLOR_15="#23cfd5" # -COLOR_16="#f8f8f2" # +export COLOR_09="#505354" # +export COLOR_10="#ff5995" # COMMAND_ERROR +export COLOR_11="#b6e354" # EXEC +export COLOR_12="#feed6c" # +export COLOR_13="#3f78ff" # FOLDER +export COLOR_14="#9e6ffe" # +export COLOR_15="#23cfd5" # +export COLOR_16="#f8f8f2" # -BACKGROUND_COLOR="#1b1d1e" # Background Color -FOREGROUND_COLOR="#f8f8f8" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Thayer Bright" +export BACKGROUND_COLOR="#1b1d1e" # Background Color +export FOREGROUND_COLOR="#f8f8f8" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Thayer Bright" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Thayer Bright" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tin.sh b/themes/tin.sh index c5ea956..869177b 100755 --- a/themes/tin.sh +++ b/themes/tin.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#8d534e" # SYNTAX_STRING -COLOR_03="#4e8d53" # COMMAND -COLOR_04="#888d4e" # COMMAND_COLOR2 -COLOR_05="#534e8d" # PATH -COLOR_06="#8d4e88" # SYNTAX_VAR -COLOR_07="#4e888d" # PROMP -COLOR_08="#ffffff" # +export COLOR_01="#000000" # HOST +export COLOR_02="#8d534e" # SYNTAX_STRING +export COLOR_03="#4e8d53" # COMMAND +export COLOR_04="#888d4e" # COMMAND_COLOR2 +export COLOR_05="#534e8d" # PATH +export COLOR_06="#8d4e88" # SYNTAX_VAR +export COLOR_07="#4e888d" # PROMP +export COLOR_08="#ffffff" # -COLOR_09="#000000" # -COLOR_10="#b57d78" # COMMAND_ERROR -COLOR_11="#78b57d" # EXEC -COLOR_12="#b0b578" # -COLOR_13="#7d78b5" # FOLDER -COLOR_14="#b578b0" # -COLOR_15="#78b0b5" # -COLOR_16="#ffffff" # +export COLOR_09="#000000" # +export COLOR_10="#b57d78" # COMMAND_ERROR +export COLOR_11="#78b57d" # EXEC +export COLOR_12="#b0b578" # +export COLOR_13="#7d78b5" # FOLDER +export COLOR_14="#b578b0" # +export COLOR_15="#78b0b5" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#2e2e35" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Tin" +export BACKGROUND_COLOR="#2e2e35" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Tin" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tin" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-blue.sh b/themes/tomorrow-night-blue.sh index 5a97528..0331fbb 100755 --- a/themes/tomorrow-night-blue.sh +++ b/themes/tomorrow-night-blue.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#FF9DA3" -COLOR_03="#D1F1A9" -COLOR_04="#FFEEAD" -COLOR_05="#BBDAFF" -COLOR_06="#EBBBFF" -COLOR_07="#99FFFF" -COLOR_08="#FFFEFE" +export COLOR_01="#000000" +export COLOR_02="#FF9DA3" +export COLOR_03="#D1F1A9" +export COLOR_04="#FFEEAD" +export COLOR_05="#BBDAFF" +export COLOR_06="#EBBBFF" +export COLOR_07="#99FFFF" +export COLOR_08="#FFFEFE" -COLOR_09="#000000" -COLOR_10="#FF9CA3" -COLOR_11="#D0F0A8" -COLOR_12="#FFEDAC" -COLOR_13="#BADAFF" -COLOR_14="#EBBAFF" -COLOR_15="#99FFFF" -COLOR_16="#FFFEFE" +export COLOR_09="#000000" +export COLOR_10="#FF9CA3" +export COLOR_11="#D0F0A8" +export COLOR_12="#FFEDAC" +export COLOR_13="#BADAFF" +export COLOR_14="#EBBAFF" +export COLOR_15="#99FFFF" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#002451" -FOREGROUND_COLOR="#FFFEFE" -CURSOR_COLOR="#FFFEFE" -PROFILE_NAME="Tomorrow Night Blue" +export BACKGROUND_COLOR="#002451" +export FOREGROUND_COLOR="#FFFEFE" +export CURSOR_COLOR="#FFFEFE" +export PROFILE_NAME="Tomorrow Night Blue" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tomorrow Night Blue" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-bright.sh b/themes/tomorrow-night-bright.sh index 13b15da..417c824 100755 --- a/themes/tomorrow-night-bright.sh +++ b/themes/tomorrow-night-bright.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#D54E53" -COLOR_03="#B9CA49" -COLOR_04="#E7C547" -COLOR_05="#79A6DA" -COLOR_06="#C397D8" -COLOR_07="#70C0B1" -COLOR_08="#FFFEFE" +export COLOR_01="#000000" +export COLOR_02="#D54E53" +export COLOR_03="#B9CA49" +export COLOR_04="#E7C547" +export COLOR_05="#79A6DA" +export COLOR_06="#C397D8" +export COLOR_07="#70C0B1" +export COLOR_08="#FFFEFE" -COLOR_09="#000000" -COLOR_10="#D44D53" -COLOR_11="#B9C949" -COLOR_12="#E6C446" -COLOR_13="#79A6DA" -COLOR_14="#C396D7" -COLOR_15="#70C0B1" -COLOR_16="#FFFEFE" +export COLOR_09="#000000" +export COLOR_10="#D44D53" +export COLOR_11="#B9C949" +export COLOR_12="#E6C446" +export COLOR_13="#79A6DA" +export COLOR_14="#C396D7" +export COLOR_15="#70C0B1" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#000000" -FOREGROUND_COLOR="#E9E9E9" -CURSOR_COLOR="#E9E9E9" -PROFILE_NAME="Tomorrow Night Bright" +export BACKGROUND_COLOR="#000000" +export FOREGROUND_COLOR="#E9E9E9" +export CURSOR_COLOR="#E9E9E9" +export PROFILE_NAME="Tomorrow Night Bright" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tomorrow Night Bright" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-eighties.sh b/themes/tomorrow-night-eighties.sh index 4a47ed0..5219645 100755 --- a/themes/tomorrow-night-eighties.sh +++ b/themes/tomorrow-night-eighties.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#F27779" -COLOR_03="#99CC99" -COLOR_04="#FFCC66" -COLOR_05="#6699CC" -COLOR_06="#CC99CC" -COLOR_07="#66CCCC" -COLOR_08="#FFFEFE" +export COLOR_01="#000000" +export COLOR_02="#F27779" +export COLOR_03="#99CC99" +export COLOR_04="#FFCC66" +export COLOR_05="#6699CC" +export COLOR_06="#CC99CC" +export COLOR_07="#66CCCC" +export COLOR_08="#FFFEFE" -COLOR_09="#000000" -COLOR_10="#F17779" -COLOR_11="#99CC99" -COLOR_12="#FFCC66" -COLOR_13="#6699CC" -COLOR_14="#CC99CC" -COLOR_15="#66CCCC" -COLOR_16="#FFFEFE" +export COLOR_09="#000000" +export COLOR_10="#F17779" +export COLOR_11="#99CC99" +export COLOR_12="#FFCC66" +export COLOR_13="#6699CC" +export COLOR_14="#CC99CC" +export COLOR_15="#66CCCC" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#2C2C2C" -FOREGROUND_COLOR="#CCCCCC" -CURSOR_COLOR="#CCCCCC" -PROFILE_NAME="Tomorrow Night Eighties" +export BACKGROUND_COLOR="#2C2C2C" +export FOREGROUND_COLOR="#CCCCCC" +export CURSOR_COLOR="#CCCCCC" +export PROFILE_NAME="Tomorrow Night Eighties" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tomorrow Night Eighties" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tomorrow-night.sh b/themes/tomorrow-night.sh index 6811f8b..90f8e67 100755 --- a/themes/tomorrow-night.sh +++ b/themes/tomorrow-night.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#CC6666" -COLOR_03="#B5BD68" -COLOR_04="#F0C674" -COLOR_05="#81A2BE" -COLOR_06="#B293BB" -COLOR_07="#8ABEB7" -COLOR_08="#FFFEFE" +export COLOR_01="#000000" +export COLOR_02="#CC6666" +export COLOR_03="#B5BD68" +export COLOR_04="#F0C674" +export COLOR_05="#81A2BE" +export COLOR_06="#B293BB" +export COLOR_07="#8ABEB7" +export COLOR_08="#FFFEFE" -COLOR_09="#000000" -COLOR_10="#CC6666" -COLOR_11="#B5BD68" -COLOR_12="#F0C574" -COLOR_13="#80A1BD" -COLOR_14="#B294BA" -COLOR_15="#8ABDB6" -COLOR_16="#FFFEFE" +export COLOR_09="#000000" +export COLOR_10="#CC6666" +export COLOR_11="#B5BD68" +export COLOR_12="#F0C574" +export COLOR_13="#80A1BD" +export COLOR_14="#B294BA" +export COLOR_15="#8ABDB6" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#1D1F21" -FOREGROUND_COLOR="#C5C8C6" -CURSOR_COLOR="#C4C8C5" -PROFILE_NAME="Tomorrow Night" +export BACKGROUND_COLOR="#1D1F21" +export FOREGROUND_COLOR="#C5C8C6" +export CURSOR_COLOR="#C4C8C5" +export PROFILE_NAME="Tomorrow Night" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tomorrow Night" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/tomorrow.sh b/themes/tomorrow.sh index e7bbe0c..da6035a 100755 --- a/themes/tomorrow.sh +++ b/themes/tomorrow.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" -COLOR_02="#C82828" -COLOR_03="#718C00" -COLOR_04="#EAB700" -COLOR_05="#4171AE" -COLOR_06="#8959A8" -COLOR_07="#3E999F" -COLOR_08="#FFFEFE" +export COLOR_01="#000000" +export COLOR_02="#C82828" +export COLOR_03="#718C00" +export COLOR_04="#EAB700" +export COLOR_05="#4171AE" +export COLOR_06="#8959A8" +export COLOR_07="#3E999F" +export COLOR_08="#FFFEFE" -COLOR_09="#000000" -COLOR_10="#C82828" -COLOR_11="#708B00" -COLOR_12="#E9B600" -COLOR_13="#4170AE" -COLOR_14="#8958A7" -COLOR_15="#3D999F" -COLOR_16="#FFFEFE" +export COLOR_09="#000000" +export COLOR_10="#C82828" +export COLOR_11="#708B00" +export COLOR_12="#E9B600" +export COLOR_13="#4170AE" +export COLOR_14="#8958A7" +export COLOR_15="#3D999F" +export COLOR_16="#FFFEFE" -BACKGROUND_COLOR="#FFFFFF" -FOREGROUND_COLOR="#4D4D4C" -CURSOR_COLOR="#4C4C4C" -PROFILE_NAME="Tomorrow" +export BACKGROUND_COLOR="#FFFFFF" +export FOREGROUND_COLOR="#4D4D4C" +export CURSOR_COLOR="#4C4C4C" +export PROFILE_NAME="Tomorrow" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Tomorrow" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/toy-chest.sh b/themes/toy-chest.sh index b980185..21fb193 100755 --- a/themes/toy-chest.sh +++ b/themes/toy-chest.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#2c3f58" # HOST -COLOR_02="#be2d26" # SYNTAX_STRING -COLOR_03="#1a9172" # COMMAND -COLOR_04="#db8e27" # COMMAND_COLOR2 -COLOR_05="#325d96" # PATH -COLOR_06="#8a5edc" # SYNTAX_VAR -COLOR_07="#35a08f" # PROMP -COLOR_08="#23d183" # +export COLOR_01="#2c3f58" # HOST +export COLOR_02="#be2d26" # SYNTAX_STRING +export COLOR_03="#1a9172" # COMMAND +export COLOR_04="#db8e27" # COMMAND_COLOR2 +export COLOR_05="#325d96" # PATH +export COLOR_06="#8a5edc" # SYNTAX_VAR +export COLOR_07="#35a08f" # PROMP +export COLOR_08="#23d183" # -COLOR_09="#336889" # -COLOR_10="#dd5944" # COMMAND_ERROR -COLOR_11="#31d07b" # EXEC -COLOR_12="#e7d84b" # -COLOR_13="#34a6da" # FOLDER -COLOR_14="#ae6bdc" # -COLOR_15="#42c3ae" # -COLOR_16="#d5d5d5" # +export COLOR_09="#336889" # +export COLOR_10="#dd5944" # COMMAND_ERROR +export COLOR_11="#31d07b" # EXEC +export COLOR_12="#e7d84b" # +export COLOR_13="#34a6da" # FOLDER +export COLOR_14="#ae6bdc" # +export COLOR_15="#42c3ae" # +export COLOR_16="#d5d5d5" # -BACKGROUND_COLOR="#24364b" # Background Color -FOREGROUND_COLOR="#31d07b" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Toy Chest" +export BACKGROUND_COLOR="#24364b" # Background Color +export FOREGROUND_COLOR="#31d07b" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Toy Chest" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Toy Chest" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/treehouse.sh b/themes/treehouse.sh index 73de01f..a03d80a 100755 --- a/themes/treehouse.sh +++ b/themes/treehouse.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#321300" # HOST -COLOR_02="#b2270e" # SYNTAX_STRING -COLOR_03="#44a900" # COMMAND -COLOR_04="#aa820c" # COMMAND_COLOR2 -COLOR_05="#58859a" # PATH -COLOR_06="#97363d" # SYNTAX_VAR -COLOR_07="#b25a1e" # PROMP -COLOR_08="#786b53" # +export COLOR_01="#321300" # HOST +export COLOR_02="#b2270e" # SYNTAX_STRING +export COLOR_03="#44a900" # COMMAND +export COLOR_04="#aa820c" # COMMAND_COLOR2 +export COLOR_05="#58859a" # PATH +export COLOR_06="#97363d" # SYNTAX_VAR +export COLOR_07="#b25a1e" # PROMP +export COLOR_08="#786b53" # -COLOR_09="#433626" # -COLOR_10="#ed5d20" # COMMAND_ERROR -COLOR_11="#55f238" # EXEC -COLOR_12="#f2b732" # -COLOR_13="#85cfed" # FOLDER -COLOR_14="#e14c5a" # -COLOR_15="#f07d14" # -COLOR_16="#ffc800" # +export COLOR_09="#433626" # +export COLOR_10="#ed5d20" # COMMAND_ERROR +export COLOR_11="#55f238" # EXEC +export COLOR_12="#f2b732" # +export COLOR_13="#85cfed" # FOLDER +export COLOR_14="#e14c5a" # +export COLOR_15="#f07d14" # +export COLOR_16="#ffc800" # -BACKGROUND_COLOR="#191919" # Background Color -FOREGROUND_COLOR="#786b53" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Treehouse" +export BACKGROUND_COLOR="#191919" # Background Color +export FOREGROUND_COLOR="#786b53" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Treehouse" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Treehouse" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/twilight.sh b/themes/twilight.sh index 0824e62..cfdafaa 100755 --- a/themes/twilight.sh +++ b/themes/twilight.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#141414" # HOST -COLOR_02="#c06d44" # SYNTAX_STRING -COLOR_03="#afb97a" # COMMAND -COLOR_04="#c2a86c" # COMMAND_COLOR2 -COLOR_05="#44474a" # PATH -COLOR_06="#b4be7c" # SYNTAX_VAR -COLOR_07="#778385" # PROMP -COLOR_08="#ffffd4" # +export COLOR_01="#141414" # HOST +export COLOR_02="#c06d44" # SYNTAX_STRING +export COLOR_03="#afb97a" # COMMAND +export COLOR_04="#c2a86c" # COMMAND_COLOR2 +export COLOR_05="#44474a" # PATH +export COLOR_06="#b4be7c" # SYNTAX_VAR +export COLOR_07="#778385" # PROMP +export COLOR_08="#ffffd4" # -COLOR_09="#262626" # -COLOR_10="#de7c4c" # COMMAND_ERROR -COLOR_11="#ccd88c" # EXEC -COLOR_12="#e2c47e" # -COLOR_13="#5a5e62" # FOLDER -COLOR_14="#d0dc8e" # -COLOR_15="#8a989b" # -COLOR_16="#ffffd4" # +export COLOR_09="#262626" # +export COLOR_10="#de7c4c" # COMMAND_ERROR +export COLOR_11="#ccd88c" # EXEC +export COLOR_12="#e2c47e" # +export COLOR_13="#5a5e62" # FOLDER +export COLOR_14="#d0dc8e" # +export COLOR_15="#8a989b" # +export COLOR_16="#ffffd4" # -BACKGROUND_COLOR="#141414" # Background Color -FOREGROUND_COLOR="#ffffd4" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Twilight" +export BACKGROUND_COLOR="#141414" # Background Color +export FOREGROUND_COLOR="#ffffd4" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Twilight" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Twilight" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/ura.sh b/themes/ura.sh index c20c781..ea55c06 100755 --- a/themes/ura.sh +++ b/themes/ura.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#c21b6f" # SYNTAX_STRING -COLOR_03="#6fc21b" # COMMAND -COLOR_04="#c26f1b" # COMMAND_COLOR2 -COLOR_05="#1b6fc2" # PATH -COLOR_06="#6f1bc2" # SYNTAX_VAR -COLOR_07="#1bc26f" # PROMP -COLOR_08="#808080" # +export COLOR_01="#000000" # HOST +export COLOR_02="#c21b6f" # SYNTAX_STRING +export COLOR_03="#6fc21b" # COMMAND +export COLOR_04="#c26f1b" # COMMAND_COLOR2 +export COLOR_05="#1b6fc2" # PATH +export COLOR_06="#6f1bc2" # SYNTAX_VAR +export COLOR_07="#1bc26f" # PROMP +export COLOR_08="#808080" # -COLOR_09="#808080" # -COLOR_10="#ee84b9" # COMMAND_ERROR -COLOR_11="#b9ee84" # EXEC -COLOR_12="#eeb984" # -COLOR_13="#84b9ee" # FOLDER -COLOR_14="#b984ee" # -COLOR_15="#84eeb9" # -COLOR_16="#e5e5e5" # +export COLOR_09="#808080" # +export COLOR_10="#ee84b9" # COMMAND_ERROR +export COLOR_11="#b9ee84" # EXEC +export COLOR_12="#eeb984" # +export COLOR_13="#84b9ee" # FOLDER +export COLOR_14="#b984ee" # +export COLOR_15="#84eeb9" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#feffee" # Background Color -FOREGROUND_COLOR="#23476a" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Ura" +export BACKGROUND_COLOR="#feffee" # Background Color +export FOREGROUND_COLOR="#23476a" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Ura" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Ura" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/urple.sh b/themes/urple.sh index b5e1889..2f73cdc 100755 --- a/themes/urple.sh +++ b/themes/urple.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#b0425b" # SYNTAX_STRING -COLOR_03="#37a415" # COMMAND -COLOR_04="#ad5c42" # COMMAND_COLOR2 -COLOR_05="#564d9b" # PATH -COLOR_06="#6c3ca1" # SYNTAX_VAR -COLOR_07="#808080" # PROMP -COLOR_08="#87799c" # +export COLOR_01="#000000" # HOST +export COLOR_02="#b0425b" # SYNTAX_STRING +export COLOR_03="#37a415" # COMMAND +export COLOR_04="#ad5c42" # COMMAND_COLOR2 +export COLOR_05="#564d9b" # PATH +export COLOR_06="#6c3ca1" # SYNTAX_VAR +export COLOR_07="#808080" # PROMP +export COLOR_08="#87799c" # -COLOR_09="#5d3225" # -COLOR_10="#ff6388" # COMMAND_ERROR -COLOR_11="#29e620" # EXEC -COLOR_12="#f08161" # -COLOR_13="#867aed" # FOLDER -COLOR_14="#a05eee" # -COLOR_15="#eaeaea" # -COLOR_16="#bfa3ff" # +export COLOR_09="#5d3225" # +export COLOR_10="#ff6388" # COMMAND_ERROR +export COLOR_11="#29e620" # EXEC +export COLOR_12="#f08161" # +export COLOR_13="#867aed" # FOLDER +export COLOR_14="#a05eee" # +export COLOR_15="#eaeaea" # +export COLOR_16="#bfa3ff" # -BACKGROUND_COLOR="#1b1b23" # Background Color -FOREGROUND_COLOR="#877a9b" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Urple" +export BACKGROUND_COLOR="#1b1b23" # Background Color +export FOREGROUND_COLOR="#877a9b" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Urple" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Urple" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/vag.sh b/themes/vag.sh index 7751152..a9a2963 100755 --- a/themes/vag.sh +++ b/themes/vag.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#303030" # HOST -COLOR_02="#a87139" # SYNTAX_STRING -COLOR_03="#39a871" # COMMAND -COLOR_04="#71a839" # COMMAND_COLOR2 -COLOR_05="#7139a8" # PATH -COLOR_06="#a83971" # SYNTAX_VAR -COLOR_07="#3971a8" # PROMP -COLOR_08="#8a8a8a" # +export COLOR_01="#303030" # HOST +export COLOR_02="#a87139" # SYNTAX_STRING +export COLOR_03="#39a871" # COMMAND +export COLOR_04="#71a839" # COMMAND_COLOR2 +export COLOR_05="#7139a8" # PATH +export COLOR_06="#a83971" # SYNTAX_VAR +export COLOR_07="#3971a8" # PROMP +export COLOR_08="#8a8a8a" # -COLOR_09="#494949" # -COLOR_10="#b0763b" # COMMAND_ERROR -COLOR_11="#3bb076" # EXEC -COLOR_12="#76b03b" # -COLOR_13="#763bb0" # FOLDER -COLOR_14="#b03b76" # -COLOR_15="#3b76b0" # -COLOR_16="#cfcfcf" # +export COLOR_09="#494949" # +export COLOR_10="#b0763b" # COMMAND_ERROR +export COLOR_11="#3bb076" # EXEC +export COLOR_12="#76b03b" # +export COLOR_13="#763bb0" # FOLDER +export COLOR_14="#b03b76" # +export COLOR_15="#3b76b0" # +export COLOR_16="#cfcfcf" # -BACKGROUND_COLOR="#191f1d" # Background Color -FOREGROUND_COLOR="#d9e6f2" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Vag" +export BACKGROUND_COLOR="#191f1d" # Background Color +export FOREGROUND_COLOR="#d9e6f2" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Vag" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Vag" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/vaughn.sh b/themes/vaughn.sh index 466eb66..9d71ff7 100755 --- a/themes/vaughn.sh +++ b/themes/vaughn.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#25234f" # HOST -COLOR_02="#705050" # SYNTAX_STRING -COLOR_03="#60b48a" # COMMAND -COLOR_04="#dfaf8f" # COMMAND_COLOR2 -COLOR_05="#5555ff" # PATH -COLOR_06="#f08cc3" # SYNTAX_VAR -COLOR_07="#8cd0d3" # PROMP -COLOR_08="#709080" # +export COLOR_01="#25234f" # HOST +export COLOR_02="#705050" # SYNTAX_STRING +export COLOR_03="#60b48a" # COMMAND +export COLOR_04="#dfaf8f" # COMMAND_COLOR2 +export COLOR_05="#5555ff" # PATH +export COLOR_06="#f08cc3" # SYNTAX_VAR +export COLOR_07="#8cd0d3" # PROMP +export COLOR_08="#709080" # -COLOR_09="#709080" # -COLOR_10="#dca3a3" # COMMAND_ERROR -COLOR_11="#60b48a" # EXEC -COLOR_12="#f0dfaf" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ec93d3" # -COLOR_15="#93e0e3" # -COLOR_16="#ffffff" # +export COLOR_09="#709080" # +export COLOR_10="#dca3a3" # COMMAND_ERROR +export COLOR_11="#60b48a" # EXEC +export COLOR_12="#f0dfaf" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ec93d3" # +export COLOR_15="#93e0e3" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#25234f" # Background Color -FOREGROUND_COLOR="#dcdccc" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Vaughn" +export BACKGROUND_COLOR="#25234f" # Background Color +export FOREGROUND_COLOR="#dcdccc" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Vaughn" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Vaughn" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/vibrant-ink.sh b/themes/vibrant-ink.sh index d539dc3..7692fc2 100755 --- a/themes/vibrant-ink.sh +++ b/themes/vibrant-ink.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#878787" # HOST -COLOR_02="#ff6600" # SYNTAX_STRING -COLOR_03="#ccff04" # COMMAND -COLOR_04="#ffcc00" # COMMAND_COLOR2 -COLOR_05="#44b4cc" # PATH -COLOR_06="#9933cc" # SYNTAX_VAR -COLOR_07="#44b4cc" # PROMP -COLOR_08="#f5f5f5" # +export COLOR_01="#878787" # HOST +export COLOR_02="#ff6600" # SYNTAX_STRING +export COLOR_03="#ccff04" # COMMAND +export COLOR_04="#ffcc00" # COMMAND_COLOR2 +export COLOR_05="#44b4cc" # PATH +export COLOR_06="#9933cc" # SYNTAX_VAR +export COLOR_07="#44b4cc" # PROMP +export COLOR_08="#f5f5f5" # -COLOR_09="#555555" # -COLOR_10="#ff0000" # COMMAND_ERROR -COLOR_11="#00ff00" # EXEC -COLOR_12="#ffff00" # -COLOR_13="#0000ff" # FOLDER -COLOR_14="#ff00ff" # -COLOR_15="#00ffff" # -COLOR_16="#e5e5e5" # +export COLOR_09="#555555" # +export COLOR_10="#ff0000" # COMMAND_ERROR +export COLOR_11="#00ff00" # EXEC +export COLOR_12="#ffff00" # +export COLOR_13="#0000ff" # FOLDER +export COLOR_14="#ff00ff" # +export COLOR_15="#00ffff" # +export COLOR_16="#e5e5e5" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#ffffff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Vibrant Ink" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#ffffff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Vibrant Ink" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Vibrant Ink" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/warm-neon.sh b/themes/warm-neon.sh index 50bb28d..ed968cc 100755 --- a/themes/warm-neon.sh +++ b/themes/warm-neon.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#e24346" # SYNTAX_STRING -COLOR_03="#39b13a" # COMMAND -COLOR_04="#dae145" # COMMAND_COLOR2 -COLOR_05="#4261c5" # PATH -COLOR_06="#f920fb" # SYNTAX_VAR -COLOR_07="#2abbd4" # PROMP -COLOR_08="#d0b8a3" # +export COLOR_01="#000000" # HOST +export COLOR_02="#e24346" # SYNTAX_STRING +export COLOR_03="#39b13a" # COMMAND +export COLOR_04="#dae145" # COMMAND_COLOR2 +export COLOR_05="#4261c5" # PATH +export COLOR_06="#f920fb" # SYNTAX_VAR +export COLOR_07="#2abbd4" # PROMP +export COLOR_08="#d0b8a3" # -COLOR_09="#fefcfc" # -COLOR_10="#e97071" # COMMAND_ERROR -COLOR_11="#9cc090" # EXEC -COLOR_12="#ddda7a" # -COLOR_13="#7b91d6" # FOLDER -COLOR_14="#f674ba" # -COLOR_15="#5ed1e5" # -COLOR_16="#d8c8bb" # +export COLOR_09="#fefcfc" # +export COLOR_10="#e97071" # COMMAND_ERROR +export COLOR_11="#9cc090" # EXEC +export COLOR_12="#ddda7a" # +export COLOR_13="#7b91d6" # FOLDER +export COLOR_14="#f674ba" # +export COLOR_15="#5ed1e5" # +export COLOR_16="#d8c8bb" # -BACKGROUND_COLOR="#404040" # Background Color -FOREGROUND_COLOR="#afdab6" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Warm Neon" +export BACKGROUND_COLOR="#404040" # Background Color +export FOREGROUND_COLOR="#afdab6" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Warm Neon" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Warm Neon" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/wez.sh b/themes/wez.sh index 47263f0..a6d54a2 100755 --- a/themes/wez.sh +++ b/themes/wez.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#cc5555" # SYNTAX_STRING -COLOR_03="#55cc55" # COMMAND -COLOR_04="#cdcd55" # COMMAND_COLOR2 -COLOR_05="#5555cc" # PATH -COLOR_06="#cc55cc" # SYNTAX_VAR -COLOR_07="#7acaca" # PROMP -COLOR_08="#cccccc" # +export COLOR_01="#000000" # HOST +export COLOR_02="#cc5555" # SYNTAX_STRING +export COLOR_03="#55cc55" # COMMAND +export COLOR_04="#cdcd55" # COMMAND_COLOR2 +export COLOR_05="#5555cc" # PATH +export COLOR_06="#cc55cc" # SYNTAX_VAR +export COLOR_07="#7acaca" # PROMP +export COLOR_08="#cccccc" # -COLOR_09="#555555" # -COLOR_10="#ff5555" # COMMAND_ERROR -COLOR_11="#55ff55" # EXEC -COLOR_12="#ffff55" # -COLOR_13="#5555ff" # FOLDER -COLOR_14="#ff55ff" # -COLOR_15="#55ffff" # -COLOR_16="#ffffff" # +export COLOR_09="#555555" # +export COLOR_10="#ff5555" # COMMAND_ERROR +export COLOR_11="#55ff55" # EXEC +export COLOR_12="#ffff55" # +export COLOR_13="#5555ff" # FOLDER +export COLOR_14="#ff55ff" # +export COLOR_15="#55ffff" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#000000" # Background Color -FOREGROUND_COLOR="#b3b3b3" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Wez" +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#b3b3b3" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Wez" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Wez" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/wild-cherry.sh b/themes/wild-cherry.sh index f4995fb..b8d91eb 100755 --- a/themes/wild-cherry.sh +++ b/themes/wild-cherry.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000507" # HOST -COLOR_02="#d94085" # SYNTAX_STRING -COLOR_03="#2ab250" # COMMAND -COLOR_04="#ffd16f" # COMMAND_COLOR2 -COLOR_05="#883cdc" # PATH -COLOR_06="#ececec" # SYNTAX_VAR -COLOR_07="#c1b8b7" # PROMP -COLOR_08="#fff8de" # +export COLOR_01="#000507" # HOST +export COLOR_02="#d94085" # SYNTAX_STRING +export COLOR_03="#2ab250" # COMMAND +export COLOR_04="#ffd16f" # COMMAND_COLOR2 +export COLOR_05="#883cdc" # PATH +export COLOR_06="#ececec" # SYNTAX_VAR +export COLOR_07="#c1b8b7" # PROMP +export COLOR_08="#fff8de" # -COLOR_09="#009cc9" # -COLOR_10="#da6bac" # COMMAND_ERROR -COLOR_11="#f4dca5" # EXEC -COLOR_12="#eac066" # -COLOR_13="#308cba" # FOLDER -COLOR_14="#ae636b" # -COLOR_15="#ff919d" # -COLOR_16="#e4838d" # +export COLOR_09="#009cc9" # +export COLOR_10="#da6bac" # COMMAND_ERROR +export COLOR_11="#f4dca5" # EXEC +export COLOR_12="#eac066" # +export COLOR_13="#308cba" # FOLDER +export COLOR_14="#ae636b" # +export COLOR_15="#ff919d" # +export COLOR_16="#e4838d" # -BACKGROUND_COLOR="#1f1726" # Background Color -FOREGROUND_COLOR="#dafaff" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Wild Cherry" +export BACKGROUND_COLOR="#1f1726" # Background Color +export FOREGROUND_COLOR="#dafaff" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Wild Cherry" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Wild Cherry" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/wombat.sh b/themes/wombat.sh index edf0522..f5ef4a5 100755 --- a/themes/wombat.sh +++ b/themes/wombat.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#000000" # HOST -COLOR_02="#ff615a" # SYNTAX_STRING -COLOR_03="#b1e969" # COMMAND -COLOR_04="#ebd99c" # COMMAND_COLOR2 -COLOR_05="#5da9f6" # PATH -COLOR_06="#e86aff" # SYNTAX_VAR -COLOR_07="#82fff7" # PROMP -COLOR_08="#dedacf" # +export COLOR_01="#000000" # HOST +export COLOR_02="#ff615a" # SYNTAX_STRING +export COLOR_03="#b1e969" # COMMAND +export COLOR_04="#ebd99c" # COMMAND_COLOR2 +export COLOR_05="#5da9f6" # PATH +export COLOR_06="#e86aff" # SYNTAX_VAR +export COLOR_07="#82fff7" # PROMP +export COLOR_08="#dedacf" # -COLOR_09="#313131" # -COLOR_10="#f58c80" # COMMAND_ERROR -COLOR_11="#ddf88f" # EXEC -COLOR_12="#eee5b2" # -COLOR_13="#a5c7ff" # FOLDER -COLOR_14="#ddaaff" # -COLOR_15="#b7fff9" # -COLOR_16="#ffffff" # +export COLOR_09="#313131" # +export COLOR_10="#f58c80" # COMMAND_ERROR +export COLOR_11="#ddf88f" # EXEC +export COLOR_12="#eee5b2" # +export COLOR_13="#a5c7ff" # FOLDER +export COLOR_14="#ddaaff" # +export COLOR_15="#b7fff9" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#171717" # Background Color -FOREGROUND_COLOR="#dedacf" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Wombat" +export BACKGROUND_COLOR="#171717" # Background Color +export FOREGROUND_COLOR="#dedacf" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Wombat" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Wombat" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/wryan.sh b/themes/wryan.sh index 6802622..ea4cae8 100755 --- a/themes/wryan.sh +++ b/themes/wryan.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#333333" # HOST -COLOR_02="#8c4665" # SYNTAX_STRING -COLOR_03="#287373" # COMMAND -COLOR_04="#7c7c99" # COMMAND_COLOR2 -COLOR_05="#395573" # PATH -COLOR_06="#5e468c" # SYNTAX_VAR -COLOR_07="#31658c" # PROMP -COLOR_08="#899ca1" # +export COLOR_01="#333333" # HOST +export COLOR_02="#8c4665" # SYNTAX_STRING +export COLOR_03="#287373" # COMMAND +export COLOR_04="#7c7c99" # COMMAND_COLOR2 +export COLOR_05="#395573" # PATH +export COLOR_06="#5e468c" # SYNTAX_VAR +export COLOR_07="#31658c" # PROMP +export COLOR_08="#899ca1" # -COLOR_09="#3d3d3d" # -COLOR_10="#bf4d80" # COMMAND_ERROR -COLOR_11="#53a6a6" # EXEC -COLOR_12="#9e9ecb" # -COLOR_13="#477ab3" # FOLDER -COLOR_14="#7e62b3" # -COLOR_15="#6096bf" # -COLOR_16="#c0c0c0" # +export COLOR_09="#3d3d3d" # +export COLOR_10="#bf4d80" # COMMAND_ERROR +export COLOR_11="#53a6a6" # EXEC +export COLOR_12="#9e9ecb" # +export COLOR_13="#477ab3" # FOLDER +export COLOR_14="#7e62b3" # +export COLOR_15="#6096bf" # +export COLOR_16="#c0c0c0" # -BACKGROUND_COLOR="#101010" # Background Color -FOREGROUND_COLOR="#999993" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Wryan" +export BACKGROUND_COLOR="#101010" # Background Color +export FOREGROUND_COLOR="#999993" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Wryan" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Wryan" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file diff --git a/themes/zenburn.sh b/themes/zenburn.sh index 06e615a..341c701 100755 --- a/themes/zenburn.sh +++ b/themes/zenburn.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -COLOR_01="#4d4d4d" # HOST -COLOR_02="#705050" # SYNTAX_STRING -COLOR_03="#60b48a" # COMMAND -COLOR_04="#f0dfaf" # COMMAND_COLOR2 -COLOR_05="#506070" # PATH -COLOR_06="#dc8cc3" # SYNTAX_VAR -COLOR_07="#8cd0d3" # PROMP -COLOR_08="#dcdccc" # +export COLOR_01="#4d4d4d" # HOST +export COLOR_02="#705050" # SYNTAX_STRING +export COLOR_03="#60b48a" # COMMAND +export COLOR_04="#f0dfaf" # COMMAND_COLOR2 +export COLOR_05="#506070" # PATH +export COLOR_06="#dc8cc3" # SYNTAX_VAR +export COLOR_07="#8cd0d3" # PROMP +export COLOR_08="#dcdccc" # -COLOR_09="#709080" # -COLOR_10="#dca3a3" # COMMAND_ERROR -COLOR_11="#c3bf9f" # EXEC -COLOR_12="#e0cf9f" # -COLOR_13="#94bff3" # FOLDER -COLOR_14="#ec93d3" # -COLOR_15="#93e0e3" # -COLOR_16="#ffffff" # +export COLOR_09="#709080" # +export COLOR_10="#dca3a3" # COMMAND_ERROR +export COLOR_11="#c3bf9f" # EXEC +export COLOR_12="#e0cf9f" # +export COLOR_13="#94bff3" # FOLDER +export COLOR_14="#ec93d3" # +export COLOR_15="#93e0e3" # +export COLOR_16="#ffffff" # -BACKGROUND_COLOR="#3f3f3f" # Background Color -FOREGROUND_COLOR="#dcdccc" # Text -CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor -PROFILE_NAME="Zenburn" +export BACKGROUND_COLOR="#3f3f3f" # Background Color +export FOREGROUND_COLOR="#dcdccc" # Text +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor +export PROFILE_NAME="Zenburn" # =============================================================== # @@ -34,22 +34,21 @@ PROFILE_NAME="Zenburn" # =============================================================== # # | Apply Colors # ===============================================================|# -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PARENT_PATH="$(dirname "$SCRIPT_PATH")" +SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" +PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} -if [ -e "${PARENT_PATH}/apply-colors.sh" ] -then - source "${PARENT_PATH}/apply-colors.sh" +if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then + bash "${PARENT_PATH}/apply-colors.sh" else - if [ "$(uname)" = "Darwin" ]; then - # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") - else - # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") - fi + if [[ "$(uname)" = "Darwin" ]]; then + # OSX ships with curl and ancient bash + (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + else + # Linux ships with wget + (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + fi fi \ No newline at end of file From e1dc74f13a98ce1026b165dcee0c4096e9b84173 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Thu, 29 Nov 2018 23:20:17 +0100 Subject: [PATCH 20/25] Change to 'bash -c' instead of 'eval' --- gogh.sh | 10 ++-- test/print-themes.sh | 8 +-- test/test.sh | 74 ++++++++++++------------ themes/3024-day.sh | 4 +- themes/3024-night.sh | 4 +- themes/_base.sh | 4 +- themes/aci.sh | 4 +- themes/aco.sh | 4 +- themes/adventuretime.sh | 4 +- themes/afterglow.sh | 4 +- themes/alien-blood.sh | 4 +- themes/argonaut.sh | 4 +- themes/arthur.sh | 4 +- themes/atom.sh | 4 +- themes/azu.sh | 4 +- themes/belafonte-day.sh | 4 +- themes/belafonte-night.sh | 4 +- themes/bim.sh | 4 +- themes/birds-of-paradise.sh | 4 +- themes/blazer.sh | 4 +- themes/borland.sh | 4 +- themes/broadcast.sh | 4 +- themes/brogrammer.sh | 4 +- themes/c64.sh | 4 +- themes/cai.sh | 4 +- themes/chalk.sh | 4 +- themes/chalkboard.sh | 4 +- themes/ciapre.sh | 4 +- themes/clone-of-ubuntu.sh | 4 +- themes/clrs.sh | 4 +- themes/cobalt-neon.sh | 4 +- themes/cobalt2.sh | 4 +- themes/crayon-pony-fish.sh | 4 +- themes/dark-pastel.sh | 4 +- themes/darkside.sh | 4 +- themes/desert.sh | 4 +- themes/dimmed-monokai.sh | 4 +- themes/dracula.sh | 4 +- themes/earthsong.sh | 4 +- themes/elemental.sh | 4 +- themes/elementary.sh | 4 +- themes/elic.sh | 4 +- themes/elio.sh | 4 +- themes/espresso-libre.sh | 4 +- themes/espresso.sh | 4 +- themes/fishtank.sh | 4 +- themes/flat.sh | 4 +- themes/flatland.sh | 4 +- themes/foxnightly.sh | 4 +- themes/freya.sh | 4 +- themes/frontend-delight.sh | 4 +- themes/frontend-fun-forrest.sh | 4 +- themes/frontend-galaxy.sh | 4 +- themes/github.sh | 4 +- themes/gooey.sh | 4 +- themes/google-dark.sh | 4 +- themes/google-light.sh | 4 +- themes/grape.sh | 4 +- themes/grass.sh | 4 +- themes/gruvbox-dark.sh | 4 +- themes/gruvbox.sh | 4 +- themes/hardcore.sh | 4 +- themes/harper.sh | 4 +- themes/hemisu-dark.sh | 4 +- themes/hemisu-light.sh | 4 +- themes/highway.sh | 4 +- themes/hipster-green.sh | 4 +- themes/homebrew.sh | 4 +- themes/hurtado.sh | 4 +- themes/hybrid.sh | 4 +- themes/ic-green-ppl.sh | 4 +- themes/ic-orange-ppl.sh | 4 +- themes/idle-toes.sh | 4 +- themes/ir-black.sh | 4 +- themes/jackie-brown.sh | 4 +- themes/japanesque.sh | 4 +- themes/jellybeans.sh | 4 +- themes/jup.sh | 4 +- themes/kibble.sh | 4 +- themes/later-this-evening.sh | 4 +- themes/lavandula.sh | 4 +- themes/liquid-carbon-transparent.sh | 4 +- themes/liquid-carbon.sh | 4 +- themes/man-page.sh | 4 +- themes/mar.sh | 4 +- themes/material.sh | 4 +- themes/mathias.sh | 4 +- themes/medallion.sh | 4 +- themes/misterioso.sh | 4 +- themes/miu.sh | 4 +- themes/molokai.sh | 4 +- themes/mona-lisa.sh | 4 +- themes/monokai-dark.sh | 4 +- themes/monokai-soda.sh | 4 +- themes/n0tch2k.sh | 4 +- themes/neopolitan.sh | 4 +- themes/nep.sh | 4 +- themes/neutron.sh | 4 +- themes/nightlion-v1.sh | 4 +- themes/nightlion-v2.sh | 4 +- themes/nighty.sh | 4 +- themes/nord-light.sh | 4 +- themes/nord.sh | 4 +- themes/novel.sh | 4 +- themes/obsidian.sh | 4 +- themes/ocean-dark.sh | 4 +- themes/ocean.sh | 4 +- themes/oceanic-next.sh | 4 +- themes/ollie.sh | 4 +- themes/one-dark.sh | 4 +- themes/one-half-black.sh | 4 +- themes/one-light.sh | 4 +- themes/pali.sh | 4 +- themes/paraiso-dark.sh | 4 +- themes/paul-millr.sh | 4 +- themes/pencil-dark.sh | 4 +- themes/pencil-light.sh | 4 +- themes/peppermint.sh | 4 +- themes/pnevma.sh | 4 +- themes/pro.sh | 4 +- themes/red-alert.sh | 4 +- themes/red-sands.sh | 4 +- themes/rippedcasts.sh | 4 +- themes/royal.sh | 4 +- themes/sat.sh | 4 +- themes/sea-shells.sh | 4 +- themes/seafoam-pastel.sh | 4 +- themes/seti.sh | 4 +- themes/shaman.sh | 4 +- themes/shel.sh | 4 +- themes/slate.sh | 4 +- themes/smyck.sh | 4 +- themes/snazzy.sh | 4 +- themes/soft-server.sh | 4 +- themes/solarized-darcula.sh | 4 +- themes/solarized-dark-higher-contrast.sh | 4 +- themes/solarized-dark.sh | 4 +- themes/solarized-light.sh | 4 +- themes/spacedust.sh | 4 +- themes/spacegray-eighties-dull.sh | 4 +- themes/spacegray-eighties.sh | 4 +- themes/spacegray.sh | 4 +- themes/spring.sh | 4 +- themes/square.sh | 4 +- themes/srcery.sh | 4 +- themes/sundried.sh | 4 +- themes/symphonic.sh | 4 +- themes/teerb.sh | 4 +- themes/terminal-basic.sh | 4 +- themes/terminix-dark.sh | 4 +- themes/thayer-bright.sh | 4 +- themes/tin.sh | 4 +- themes/tomorrow-night-blue.sh | 4 +- themes/tomorrow-night-bright.sh | 4 +- themes/tomorrow-night-eighties.sh | 4 +- themes/tomorrow-night.sh | 4 +- themes/tomorrow.sh | 4 +- themes/toy-chest.sh | 4 +- themes/treehouse.sh | 4 +- themes/twilight.sh | 4 +- themes/ura.sh | 4 +- themes/urple.sh | 4 +- themes/vag.sh | 4 +- themes/vaughn.sh | 4 +- themes/vibrant-ink.sh | 4 +- themes/warm-neon.sh | 4 +- themes/wez.sh | 4 +- themes/wild-cherry.sh | 4 +- themes/wombat.sh | 4 +- themes/wryan.sh | 4 +- themes/zenburn.sh | 4 +- 171 files changed, 382 insertions(+), 382 deletions(-) diff --git a/gogh.sh b/gogh.sh index 693878d..657ffc7 100755 --- a/gogh.sh +++ b/gogh.sh @@ -205,10 +205,10 @@ set_gogh() { else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl - (eval "$(curl -sLo- "${url}")") + bash -c "$(curl -sLo- "${url}")" else # Linux ships with wget - (eval "$(wget -qO- "${url}")") + bash -c "$(wget -qO- "${url}")" fi fi } @@ -248,7 +248,7 @@ if [[ ${COLUMNS:-$(tput cols)} -ge 80 ]]; then printf '%b\n' "${gogh_str}" - #sleep 2.5 + sleep 2.5 else echo -e "\nGogh\n" for c in {0..15}; do @@ -319,9 +319,9 @@ fi # | if [[ ${#OPTION[@]} -gt 5 ]]; then if [[ "$(uname)" = "Darwin" ]]; then - eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null + eval "$(curl -sLo- https://git.io/progressbar)" 2> /dev/null else - eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null + eval "$(wget -qO- https://git.io/progressbar)" 2> /dev/null fi fi diff --git a/test/print-themes.sh b/test/print-themes.sh index 4f57efd..0492184 100755 --- a/test/print-themes.sh +++ b/test/print-themes.sh @@ -251,9 +251,9 @@ set_gogh() { bash "${PARENT_PATH}/themes/$1" else if [[ "$(uname)" = "Darwin" ]]; then - (eval "$(curl -so- "${url}")") + bash -c "$(curl -so- "${url}")" else - (eval "$(wget -qO- "${url}")") + bash -c "$(wget -qO- "${url}")" fi fi } @@ -264,9 +264,9 @@ remove_file_extension (){ # Fancy progress bar if [[ "$(uname)" = "Darwin" ]]; then - eval "$(curl -sLo- "https://git.io/progressbar")" 2> /dev/null + eval "$(curl -sLo- https://git.io/progressbar)" 2> /dev/null else - eval "$(wget -qO- "https://git.io/progressbar")" 2> /dev/null + eval "$(wget -qO- https://git.io/progressbar)" 2> /dev/null fi declare color_dot_str diff --git a/test/test.sh b/test/test.sh index b8db4eb..1fab4d2 100644 --- a/test/test.sh +++ b/test/test.sh @@ -69,77 +69,77 @@ color () { } -wget -O xt http://git.io/v3D44 && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D44")" color -wget -O xt https://git.io/v5mXj && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5mXj")" color -wget -O xt http://git.io/v3D4d && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D4d")" color -wget -O xt https://git.io/v5mXA && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5mXA")" color -wget -O xt http://git.io/v3D4N && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D4N")" color -wget -O xt http://git.io/v3D4o && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D4o")" color -wget -O xt http://git.io/v3D82 && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D82")" color -wget -O xt http://git.io/v3D8e && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D8e")" color -wget -O xt http://git.io/v3D8R && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3D8R")" color -wget -O xt https://git.io/v5mXi && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5mXi")" color -wget -O xt http://git.io/v3DB9 && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DB9")" color -wget -O xt http://git.io/v3DBB && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBB")" color -wget -O xt http://git.io/v3DBe && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBe")" color -wget -O xt http://git.io/v3DBF && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBF")" color -wget -O xt http://git.io/v3DBK && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBK")" color -wget -O xt http://git.io/v3DBM && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBM")" color -wget -O xt https://git.io/v5mPp && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5mPp")" color -wget -O xt http://git.io/v3DBP && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBP")" color -wget -O xt http://git.io/v5f6B && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v5f6B")" color -wget -O xt http://git.io/v3DBT && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBT")" color -wget -O xt http://git.io/v3DBv && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBv")" color -wget -O xt http://git.io/v3DBV && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DBV")" color -wget -O xt https://git.io/vQ9TY && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/vQ9TY")" color -wget -O xt http://git.io/v3Dlb && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dlb")" color -wget -O xt http://git.io/v3Dlb && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dlb")" color -wget -O xt http://git.io/v3Dli && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dli")" color -wget -O xt http://git.io/v3Dll && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dll")" color -wget -O xt http://git.io/v3Dlm && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dlm")" color -wget -O xt http://git.io/v3Dlr && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dlr")" color -wget -O xt http://git.io/v3Dlz && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3Dlz")" color -wget -O xt http://git.io/v3DR0 && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DR0")" color -wget -O xt http://git.io/v3DRB && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DRB")" color -wget -O xt https://git.io/v5m1t && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5m1t")" color -wget -O xt http://git.io/v3DRc && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DRc")" color -wget -O xt https://git.io/v5m1s && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5m1s")" color -wget -O xt https://git.io/v5m1Y && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "https://git.io/v5m1Y")" color -wget -O xt http://git.io/v3DRs && chmod +x xt && ./xt && rm xt +bash -c "$(wget -qO- "http://git.io/v3DRs")" color diff --git a/themes/3024-day.sh b/themes/3024-day.sh index 7e10355..152e6ca 100755 --- a/themes/3024-day.sh +++ b/themes/3024-day.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/3024-night.sh b/themes/3024-night.sh index d6b4ce0..096d55e 100755 --- a/themes/3024-night.sh +++ b/themes/3024-night.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/_base.sh b/themes/_base.sh index 0465791..90161d2 100755 --- a/themes/_base.sh +++ b/themes/_base.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/aci.sh b/themes/aci.sh index d582e86..93251b0 100755 --- a/themes/aci.sh +++ b/themes/aci.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/aco.sh b/themes/aco.sh index 2ea8988..c0634cd 100755 --- a/themes/aco.sh +++ b/themes/aco.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/adventuretime.sh b/themes/adventuretime.sh index ce2c587..48b3696 100755 --- a/themes/adventuretime.sh +++ b/themes/adventuretime.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/afterglow.sh b/themes/afterglow.sh index a7505b5..bef6747 100755 --- a/themes/afterglow.sh +++ b/themes/afterglow.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/alien-blood.sh b/themes/alien-blood.sh index 2c8c1da..f78faf9 100755 --- a/themes/alien-blood.sh +++ b/themes/alien-blood.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/argonaut.sh b/themes/argonaut.sh index f6c11de..4744950 100755 --- a/themes/argonaut.sh +++ b/themes/argonaut.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/arthur.sh b/themes/arthur.sh index 494e6c3..86e7e43 100755 --- a/themes/arthur.sh +++ b/themes/arthur.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/atom.sh b/themes/atom.sh index 6966ceb..f1a603e 100755 --- a/themes/atom.sh +++ b/themes/atom.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/azu.sh b/themes/azu.sh index f77557e..4f26cdf 100755 --- a/themes/azu.sh +++ b/themes/azu.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/belafonte-day.sh b/themes/belafonte-day.sh index f5c7af8..fd6462f 100755 --- a/themes/belafonte-day.sh +++ b/themes/belafonte-day.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/belafonte-night.sh b/themes/belafonte-night.sh index 00dcf61..ca089c8 100755 --- a/themes/belafonte-night.sh +++ b/themes/belafonte-night.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/bim.sh b/themes/bim.sh index 0b479b1..14cd3d5 100755 --- a/themes/bim.sh +++ b/themes/bim.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/birds-of-paradise.sh b/themes/birds-of-paradise.sh index 868e252..97ee053 100755 --- a/themes/birds-of-paradise.sh +++ b/themes/birds-of-paradise.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/blazer.sh b/themes/blazer.sh index 459e319..fcd8cf9 100755 --- a/themes/blazer.sh +++ b/themes/blazer.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/borland.sh b/themes/borland.sh index 69d1983..46e9535 100755 --- a/themes/borland.sh +++ b/themes/borland.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/broadcast.sh b/themes/broadcast.sh index bd76d3d..8308ba7 100755 --- a/themes/broadcast.sh +++ b/themes/broadcast.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/brogrammer.sh b/themes/brogrammer.sh index 46d0457..a4ac49f 100755 --- a/themes/brogrammer.sh +++ b/themes/brogrammer.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/c64.sh b/themes/c64.sh index 8d18f7b..a79c108 100755 --- a/themes/c64.sh +++ b/themes/c64.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/cai.sh b/themes/cai.sh index 6ee832d..827c8fb 100755 --- a/themes/cai.sh +++ b/themes/cai.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/chalk.sh b/themes/chalk.sh index 3a311ff..3df3948 100755 --- a/themes/chalk.sh +++ b/themes/chalk.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/chalkboard.sh b/themes/chalkboard.sh index 4f0352d..587623d 100755 --- a/themes/chalkboard.sh +++ b/themes/chalkboard.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ciapre.sh b/themes/ciapre.sh index 1ed2ec9..058825c 100755 --- a/themes/ciapre.sh +++ b/themes/ciapre.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/clone-of-ubuntu.sh b/themes/clone-of-ubuntu.sh index 39d009f..5611627 100755 --- a/themes/clone-of-ubuntu.sh +++ b/themes/clone-of-ubuntu.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/clrs.sh b/themes/clrs.sh index 2541c57..d879328 100755 --- a/themes/clrs.sh +++ b/themes/clrs.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/cobalt-neon.sh b/themes/cobalt-neon.sh index d21447b..f670278 100755 --- a/themes/cobalt-neon.sh +++ b/themes/cobalt-neon.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/cobalt2.sh b/themes/cobalt2.sh index 7275ebc..c17bb53 100755 --- a/themes/cobalt2.sh +++ b/themes/cobalt2.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/crayon-pony-fish.sh b/themes/crayon-pony-fish.sh index fa18b67..36508e1 100755 --- a/themes/crayon-pony-fish.sh +++ b/themes/crayon-pony-fish.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/dark-pastel.sh b/themes/dark-pastel.sh index b1f9ddf..0c93656 100755 --- a/themes/dark-pastel.sh +++ b/themes/dark-pastel.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/darkside.sh b/themes/darkside.sh index 3ed1333..c574d2f 100755 --- a/themes/darkside.sh +++ b/themes/darkside.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/desert.sh b/themes/desert.sh index e001442..e25c6c8 100755 --- a/themes/desert.sh +++ b/themes/desert.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/dimmed-monokai.sh b/themes/dimmed-monokai.sh index 344e8f9..1d64adc 100755 --- a/themes/dimmed-monokai.sh +++ b/themes/dimmed-monokai.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/dracula.sh b/themes/dracula.sh index d76f038..ba0b208 100755 --- a/themes/dracula.sh +++ b/themes/dracula.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/earthsong.sh b/themes/earthsong.sh index c9ba224..348069c 100755 --- a/themes/earthsong.sh +++ b/themes/earthsong.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/elemental.sh b/themes/elemental.sh index 22377ec..be37948 100755 --- a/themes/elemental.sh +++ b/themes/elemental.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/elementary.sh b/themes/elementary.sh index 53c1140..fbe6a78 100755 --- a/themes/elementary.sh +++ b/themes/elementary.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/elic.sh b/themes/elic.sh index fa52f54..efa6fb0 100755 --- a/themes/elic.sh +++ b/themes/elic.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/elio.sh b/themes/elio.sh index b423dce..f49bdd7 100755 --- a/themes/elio.sh +++ b/themes/elio.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/espresso-libre.sh b/themes/espresso-libre.sh index 1c7bf7f..bbf51f6 100755 --- a/themes/espresso-libre.sh +++ b/themes/espresso-libre.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/espresso.sh b/themes/espresso.sh index c11195c..effa1fd 100755 --- a/themes/espresso.sh +++ b/themes/espresso.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/fishtank.sh b/themes/fishtank.sh index f5df7fc..0953a1c 100755 --- a/themes/fishtank.sh +++ b/themes/fishtank.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/flat.sh b/themes/flat.sh index 2c5bd2b..ccd09c6 100755 --- a/themes/flat.sh +++ b/themes/flat.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/flatland.sh b/themes/flatland.sh index ba61878..d7ed282 100755 --- a/themes/flatland.sh +++ b/themes/flatland.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/foxnightly.sh b/themes/foxnightly.sh index 7a5f283..ca385c1 100755 --- a/themes/foxnightly.sh +++ b/themes/foxnightly.sh @@ -47,9 +47,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/freya.sh b/themes/freya.sh index 1012ed1..a751416 100755 --- a/themes/freya.sh +++ b/themes/freya.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/frontend-delight.sh b/themes/frontend-delight.sh index 133301a..a03e35c 100755 --- a/themes/frontend-delight.sh +++ b/themes/frontend-delight.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/frontend-fun-forrest.sh b/themes/frontend-fun-forrest.sh index 28d4bf6..82ea7a3 100755 --- a/themes/frontend-fun-forrest.sh +++ b/themes/frontend-fun-forrest.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/frontend-galaxy.sh b/themes/frontend-galaxy.sh index 27b7fbe..78a7ea1 100755 --- a/themes/frontend-galaxy.sh +++ b/themes/frontend-galaxy.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/github.sh b/themes/github.sh index 8220188..1ecb0fa 100755 --- a/themes/github.sh +++ b/themes/github.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/gooey.sh b/themes/gooey.sh index 0c5108f..068f0b6 100755 --- a/themes/gooey.sh +++ b/themes/gooey.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/google-dark.sh b/themes/google-dark.sh index 5e1317b..98ad752 100755 --- a/themes/google-dark.sh +++ b/themes/google-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/google-light.sh b/themes/google-light.sh index c05fdc9..52a03a9 100755 --- a/themes/google-light.sh +++ b/themes/google-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/grape.sh b/themes/grape.sh index 2910e5e..e904c15 100755 --- a/themes/grape.sh +++ b/themes/grape.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/grass.sh b/themes/grass.sh index 0878e84..0ac9447 100755 --- a/themes/grass.sh +++ b/themes/grass.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/gruvbox-dark.sh b/themes/gruvbox-dark.sh index fee3c8d..39234a7 100755 --- a/themes/gruvbox-dark.sh +++ b/themes/gruvbox-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/gruvbox.sh b/themes/gruvbox.sh index 79fbb38..b31d74e 100755 --- a/themes/gruvbox.sh +++ b/themes/gruvbox.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hardcore.sh b/themes/hardcore.sh index 82509ce..701c8fc 100755 --- a/themes/hardcore.sh +++ b/themes/hardcore.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/harper.sh b/themes/harper.sh index cc2096d..c599e9f 100755 --- a/themes/harper.sh +++ b/themes/harper.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hemisu-dark.sh b/themes/hemisu-dark.sh index e4ccd03..d3524e7 100755 --- a/themes/hemisu-dark.sh +++ b/themes/hemisu-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hemisu-light.sh b/themes/hemisu-light.sh index 150528b..236ad88 100755 --- a/themes/hemisu-light.sh +++ b/themes/hemisu-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/highway.sh b/themes/highway.sh index 1378228..0953653 100755 --- a/themes/highway.sh +++ b/themes/highway.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hipster-green.sh b/themes/hipster-green.sh index 02c0fae..87eea01 100755 --- a/themes/hipster-green.sh +++ b/themes/hipster-green.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/homebrew.sh b/themes/homebrew.sh index 8f1e657..4134cb1 100755 --- a/themes/homebrew.sh +++ b/themes/homebrew.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hurtado.sh b/themes/hurtado.sh index 7a90479..a4dbe3e 100755 --- a/themes/hurtado.sh +++ b/themes/hurtado.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/hybrid.sh b/themes/hybrid.sh index 3a8c241..1c508d0 100755 --- a/themes/hybrid.sh +++ b/themes/hybrid.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ic-green-ppl.sh b/themes/ic-green-ppl.sh index 3f551d7..fc34a1e 100755 --- a/themes/ic-green-ppl.sh +++ b/themes/ic-green-ppl.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ic-orange-ppl.sh b/themes/ic-orange-ppl.sh index 8bb4994..b1aa7f9 100755 --- a/themes/ic-orange-ppl.sh +++ b/themes/ic-orange-ppl.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/idle-toes.sh b/themes/idle-toes.sh index 08587a9..5f7bbf8 100755 --- a/themes/idle-toes.sh +++ b/themes/idle-toes.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ir-black.sh b/themes/ir-black.sh index 55de9a1..25c0892 100755 --- a/themes/ir-black.sh +++ b/themes/ir-black.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/jackie-brown.sh b/themes/jackie-brown.sh index 1d21426..8f90e41 100755 --- a/themes/jackie-brown.sh +++ b/themes/jackie-brown.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/japanesque.sh b/themes/japanesque.sh index 56357de..2dd694d 100755 --- a/themes/japanesque.sh +++ b/themes/japanesque.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/jellybeans.sh b/themes/jellybeans.sh index 20e38bd..ecd14cc 100755 --- a/themes/jellybeans.sh +++ b/themes/jellybeans.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/jup.sh b/themes/jup.sh index 2864215..9963120 100755 --- a/themes/jup.sh +++ b/themes/jup.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/kibble.sh b/themes/kibble.sh index 32e040d..f0c7c8c 100755 --- a/themes/kibble.sh +++ b/themes/kibble.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/later-this-evening.sh b/themes/later-this-evening.sh index a119419..378d76c 100755 --- a/themes/later-this-evening.sh +++ b/themes/later-this-evening.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/lavandula.sh b/themes/lavandula.sh index 1a0e98d..8689797 100755 --- a/themes/lavandula.sh +++ b/themes/lavandula.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/liquid-carbon-transparent.sh b/themes/liquid-carbon-transparent.sh index fd87922..da96734 100755 --- a/themes/liquid-carbon-transparent.sh +++ b/themes/liquid-carbon-transparent.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/liquid-carbon.sh b/themes/liquid-carbon.sh index 51ac98f..4f973d5 100755 --- a/themes/liquid-carbon.sh +++ b/themes/liquid-carbon.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/man-page.sh b/themes/man-page.sh index 418dd2f..fc95c34 100755 --- a/themes/man-page.sh +++ b/themes/man-page.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/mar.sh b/themes/mar.sh index 9291d76..40b13ea 100755 --- a/themes/mar.sh +++ b/themes/mar.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/material.sh b/themes/material.sh index b852399..69daef4 100755 --- a/themes/material.sh +++ b/themes/material.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/mathias.sh b/themes/mathias.sh index 0327ab8..5cc260e 100755 --- a/themes/mathias.sh +++ b/themes/mathias.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/medallion.sh b/themes/medallion.sh index ed6ff04..e95cf06 100755 --- a/themes/medallion.sh +++ b/themes/medallion.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/misterioso.sh b/themes/misterioso.sh index a171252..bb21960 100755 --- a/themes/misterioso.sh +++ b/themes/misterioso.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/miu.sh b/themes/miu.sh index 299766d..3194173 100755 --- a/themes/miu.sh +++ b/themes/miu.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/molokai.sh b/themes/molokai.sh index 10b3785..b96141f 100755 --- a/themes/molokai.sh +++ b/themes/molokai.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/mona-lisa.sh b/themes/mona-lisa.sh index 7eee435..9614db6 100755 --- a/themes/mona-lisa.sh +++ b/themes/mona-lisa.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/monokai-dark.sh b/themes/monokai-dark.sh index 26600c0..46b05b0 100755 --- a/themes/monokai-dark.sh +++ b/themes/monokai-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/monokai-soda.sh b/themes/monokai-soda.sh index 31b034d..1f09683 100755 --- a/themes/monokai-soda.sh +++ b/themes/monokai-soda.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/n0tch2k.sh b/themes/n0tch2k.sh index e8a0f52..7e52393 100755 --- a/themes/n0tch2k.sh +++ b/themes/n0tch2k.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/neopolitan.sh b/themes/neopolitan.sh index 62e38c8..00948eb 100755 --- a/themes/neopolitan.sh +++ b/themes/neopolitan.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nep.sh b/themes/nep.sh index f4a848b..5d8b626 100755 --- a/themes/nep.sh +++ b/themes/nep.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/neutron.sh b/themes/neutron.sh index 924c584..c145fa3 100755 --- a/themes/neutron.sh +++ b/themes/neutron.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nightlion-v1.sh b/themes/nightlion-v1.sh index 7bf25db..e10be29 100755 --- a/themes/nightlion-v1.sh +++ b/themes/nightlion-v1.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nightlion-v2.sh b/themes/nightlion-v2.sh index 71c2246..9ce9050 100755 --- a/themes/nightlion-v2.sh +++ b/themes/nightlion-v2.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nighty.sh b/themes/nighty.sh index 4111bdd..4f7fc0c 100755 --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nord-light.sh b/themes/nord-light.sh index 7928315..9ae62fb 100755 --- a/themes/nord-light.sh +++ b/themes/nord-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/nord.sh b/themes/nord.sh index 7a267ec..4e51a49 100755 --- a/themes/nord.sh +++ b/themes/nord.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/novel.sh b/themes/novel.sh index 434d56b..b16f9ab 100755 --- a/themes/novel.sh +++ b/themes/novel.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/obsidian.sh b/themes/obsidian.sh index 07d40b3..3ec65bb 100755 --- a/themes/obsidian.sh +++ b/themes/obsidian.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ocean-dark.sh b/themes/ocean-dark.sh index 2625c10..7d15195 100755 --- a/themes/ocean-dark.sh +++ b/themes/ocean-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ocean.sh b/themes/ocean.sh index 233b46e..43bd155 100755 --- a/themes/ocean.sh +++ b/themes/ocean.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/oceanic-next.sh b/themes/oceanic-next.sh index f68d6ec..aeafe74 100755 --- a/themes/oceanic-next.sh +++ b/themes/oceanic-next.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ollie.sh b/themes/ollie.sh index 4cdc5a7..5865cc1 100755 --- a/themes/ollie.sh +++ b/themes/ollie.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/one-dark.sh b/themes/one-dark.sh index f4ef7e2..0322e4f 100755 --- a/themes/one-dark.sh +++ b/themes/one-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/one-half-black.sh b/themes/one-half-black.sh index 2e4a372..50a362a 100755 --- a/themes/one-half-black.sh +++ b/themes/one-half-black.sh @@ -48,9 +48,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/one-light.sh b/themes/one-light.sh index 4f8ce2e..1981652 100755 --- a/themes/one-light.sh +++ b/themes/one-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/pali.sh b/themes/pali.sh index 0c6e6c8..a09cef7 100755 --- a/themes/pali.sh +++ b/themes/pali.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/paraiso-dark.sh b/themes/paraiso-dark.sh index 9eec8a8..5e327fc 100755 --- a/themes/paraiso-dark.sh +++ b/themes/paraiso-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/paul-millr.sh b/themes/paul-millr.sh index e3f6325..07f736a 100755 --- a/themes/paul-millr.sh +++ b/themes/paul-millr.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/pencil-dark.sh b/themes/pencil-dark.sh index c1775fe..68edd9e 100755 --- a/themes/pencil-dark.sh +++ b/themes/pencil-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/pencil-light.sh b/themes/pencil-light.sh index d9eb5d2..9560889 100755 --- a/themes/pencil-light.sh +++ b/themes/pencil-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/peppermint.sh b/themes/peppermint.sh index 2d9f4a2..f0f41b7 100755 --- a/themes/peppermint.sh +++ b/themes/peppermint.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/pnevma.sh b/themes/pnevma.sh index 2637b90..bc5dfa2 100755 --- a/themes/pnevma.sh +++ b/themes/pnevma.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/pro.sh b/themes/pro.sh index a08ffa9..3733507 100755 --- a/themes/pro.sh +++ b/themes/pro.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/red-alert.sh b/themes/red-alert.sh index 60e4fef..488238a 100755 --- a/themes/red-alert.sh +++ b/themes/red-alert.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/red-sands.sh b/themes/red-sands.sh index fafc8b7..6aa1d08 100755 --- a/themes/red-sands.sh +++ b/themes/red-sands.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/rippedcasts.sh b/themes/rippedcasts.sh index 9ee3d1e..b9c6e13 100755 --- a/themes/rippedcasts.sh +++ b/themes/rippedcasts.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/royal.sh b/themes/royal.sh index 2842e26..4e69607 100755 --- a/themes/royal.sh +++ b/themes/royal.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/sat.sh b/themes/sat.sh index 11f43b0..92f4018 100755 --- a/themes/sat.sh +++ b/themes/sat.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/sea-shells.sh b/themes/sea-shells.sh index be5e1de..3db6b69 100755 --- a/themes/sea-shells.sh +++ b/themes/sea-shells.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/seafoam-pastel.sh b/themes/seafoam-pastel.sh index 794ca78..3d8d495 100755 --- a/themes/seafoam-pastel.sh +++ b/themes/seafoam-pastel.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/seti.sh b/themes/seti.sh index 7e75f55..f9e6e07 100755 --- a/themes/seti.sh +++ b/themes/seti.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/shaman.sh b/themes/shaman.sh index 5676a4d..16bb9a8 100755 --- a/themes/shaman.sh +++ b/themes/shaman.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/shel.sh b/themes/shel.sh index 7a6f41b..fe45b3a 100755 --- a/themes/shel.sh +++ b/themes/shel.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/slate.sh b/themes/slate.sh index 0000e65..a470acd 100755 --- a/themes/slate.sh +++ b/themes/slate.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/smyck.sh b/themes/smyck.sh index 8cb3d06..c0820df 100755 --- a/themes/smyck.sh +++ b/themes/smyck.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/snazzy.sh b/themes/snazzy.sh index 5fde346..47b6998 100755 --- a/themes/snazzy.sh +++ b/themes/snazzy.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/soft-server.sh b/themes/soft-server.sh index 72020d9..d01855f 100755 --- a/themes/soft-server.sh +++ b/themes/soft-server.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/solarized-darcula.sh b/themes/solarized-darcula.sh index fab6d7a..ff36ec7 100755 --- a/themes/solarized-darcula.sh +++ b/themes/solarized-darcula.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/solarized-dark-higher-contrast.sh b/themes/solarized-dark-higher-contrast.sh index 5b2ed39..f7fd0c0 100755 --- a/themes/solarized-dark-higher-contrast.sh +++ b/themes/solarized-dark-higher-contrast.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/solarized-dark.sh b/themes/solarized-dark.sh index c119c3d..10838c1 100755 --- a/themes/solarized-dark.sh +++ b/themes/solarized-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/solarized-light.sh b/themes/solarized-light.sh index d14e56c..cd206c5 100755 --- a/themes/solarized-light.sh +++ b/themes/solarized-light.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/spacedust.sh b/themes/spacedust.sh index e7127e9..cb5bdf8 100755 --- a/themes/spacedust.sh +++ b/themes/spacedust.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/spacegray-eighties-dull.sh b/themes/spacegray-eighties-dull.sh index 5324aac..10d240d 100755 --- a/themes/spacegray-eighties-dull.sh +++ b/themes/spacegray-eighties-dull.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/spacegray-eighties.sh b/themes/spacegray-eighties.sh index 1e2c97b..7287ff6 100755 --- a/themes/spacegray-eighties.sh +++ b/themes/spacegray-eighties.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/spacegray.sh b/themes/spacegray.sh index fde4b47..3b9b759 100755 --- a/themes/spacegray.sh +++ b/themes/spacegray.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/spring.sh b/themes/spring.sh index 694bcc0..7aad8f1 100755 --- a/themes/spring.sh +++ b/themes/spring.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/square.sh b/themes/square.sh index 52776ee..0eefef9 100755 --- a/themes/square.sh +++ b/themes/square.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/srcery.sh b/themes/srcery.sh index b2806f6..1ca22fd 100755 --- a/themes/srcery.sh +++ b/themes/srcery.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/sundried.sh b/themes/sundried.sh index 380b45d..0bdad98 100755 --- a/themes/sundried.sh +++ b/themes/sundried.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/symphonic.sh b/themes/symphonic.sh index 379fef5..e670a5b 100755 --- a/themes/symphonic.sh +++ b/themes/symphonic.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/teerb.sh b/themes/teerb.sh index 9b8c6c0..f1c59db 100755 --- a/themes/teerb.sh +++ b/themes/teerb.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/terminal-basic.sh b/themes/terminal-basic.sh index 7807534..385a61b 100755 --- a/themes/terminal-basic.sh +++ b/themes/terminal-basic.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/terminix-dark.sh b/themes/terminix-dark.sh index 53264f1..3897019 100755 --- a/themes/terminix-dark.sh +++ b/themes/terminix-dark.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/thayer-bright.sh b/themes/thayer-bright.sh index 52880c2..cee460b 100755 --- a/themes/thayer-bright.sh +++ b/themes/thayer-bright.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tin.sh b/themes/tin.sh index 869177b..8805930 100755 --- a/themes/tin.sh +++ b/themes/tin.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-blue.sh b/themes/tomorrow-night-blue.sh index 0331fbb..529c232 100755 --- a/themes/tomorrow-night-blue.sh +++ b/themes/tomorrow-night-blue.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-bright.sh b/themes/tomorrow-night-bright.sh index 417c824..cb091ee 100755 --- a/themes/tomorrow-night-bright.sh +++ b/themes/tomorrow-night-bright.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tomorrow-night-eighties.sh b/themes/tomorrow-night-eighties.sh index 5219645..21d78d1 100755 --- a/themes/tomorrow-night-eighties.sh +++ b/themes/tomorrow-night-eighties.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tomorrow-night.sh b/themes/tomorrow-night.sh index 90f8e67..40ad4e0 100755 --- a/themes/tomorrow-night.sh +++ b/themes/tomorrow-night.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/tomorrow.sh b/themes/tomorrow.sh index da6035a..e51c954 100755 --- a/themes/tomorrow.sh +++ b/themes/tomorrow.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/toy-chest.sh b/themes/toy-chest.sh index 21fb193..c591518 100755 --- a/themes/toy-chest.sh +++ b/themes/toy-chest.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/treehouse.sh b/themes/treehouse.sh index a03d80a..69d8fe8 100755 --- a/themes/treehouse.sh +++ b/themes/treehouse.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/twilight.sh b/themes/twilight.sh index cfdafaa..3b51883 100755 --- a/themes/twilight.sh +++ b/themes/twilight.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/ura.sh b/themes/ura.sh index ea55c06..eb9f5d3 100755 --- a/themes/ura.sh +++ b/themes/ura.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/urple.sh b/themes/urple.sh index 2f73cdc..ec90aeb 100755 --- a/themes/urple.sh +++ b/themes/urple.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/vag.sh b/themes/vag.sh index a9a2963..5d2afa5 100755 --- a/themes/vag.sh +++ b/themes/vag.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/vaughn.sh b/themes/vaughn.sh index 9d71ff7..27572ab 100755 --- a/themes/vaughn.sh +++ b/themes/vaughn.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/vibrant-ink.sh b/themes/vibrant-ink.sh index 7692fc2..13e9670 100755 --- a/themes/vibrant-ink.sh +++ b/themes/vibrant-ink.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/warm-neon.sh b/themes/warm-neon.sh index ed968cc..7ca78db 100755 --- a/themes/warm-neon.sh +++ b/themes/warm-neon.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/wez.sh b/themes/wez.sh index a6d54a2..1999f82 100755 --- a/themes/wez.sh +++ b/themes/wez.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/wild-cherry.sh b/themes/wild-cherry.sh index b8d91eb..a86a385 100755 --- a/themes/wild-cherry.sh +++ b/themes/wild-cherry.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/wombat.sh b/themes/wombat.sh index f5ef4a5..96f1982 100755 --- a/themes/wombat.sh +++ b/themes/wombat.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/wryan.sh b/themes/wryan.sh index ea4cae8..3f406cb 100755 --- a/themes/wryan.sh +++ b/themes/wryan.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file diff --git a/themes/zenburn.sh b/themes/zenburn.sh index 341c701..cba3012 100755 --- a/themes/zenburn.sh +++ b/themes/zenburn.sh @@ -46,9 +46,9 @@ if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then else if [[ "$(uname)" = "Darwin" ]]; then # OSX ships with curl and ancient bash - (eval "$(curl -so- "${BASE_URL}/apply-colors.sh")") + bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" else # Linux ships with wget - (eval "$(wget -qO- "${BASE_URL}/apply-colors.sh")") + bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi fi \ No newline at end of file From ae3ff8d680bd40cc39673ebf3819b737b620164c Mon Sep 17 00:00:00 2001 From: Kristoffer Minya <29523105+phenonymous@users.noreply.github.com> Date: Fri, 30 Nov 2018 17:34:24 +0100 Subject: [PATCH 21/25] Update README.md Changed one liner command to a more simpler one --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a12bc7a..eb9ad37 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Color Schemes For Ubuntu, Linux Mint, Elementary OS and all distributions that u ## Pre-Install ```bash -$ sudo apt-get install dconf-cli + $ sudo apt-get install dconf-cli ``` ## [Install](https://github.com/Mayccoll/Gogh/blob/master/content/install.md) @@ -27,7 +27,13 @@ $ sudo apt-get install dconf-cli Just copy and paste One line command. ```bash - $ wget -O gogh https://git.io/vQgMr && chmod +x gogh && ./gogh && rm gogh + $ bash -c "$(wget -qO- https://git.io/vQgMr)" +``` + +or if you are a mac user + +```bash + $ bash -c "$(curl -sLo- https://git.io/vQgMr)" ``` **DEMO:** From 5bdddddd62ecec6a822abf551077474124a90114 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Fri, 30 Nov 2018 23:02:56 +0100 Subject: [PATCH 22/25] Add new line to EOF --- themes/3024-day.sh | 3 ++- themes/3024-night.sh | 2 +- themes/_base.sh | 2 +- themes/aci.sh | 2 +- themes/aco.sh | 2 +- themes/adventuretime.sh | 2 +- themes/afterglow.sh | 2 +- themes/alien-blood.sh | 2 +- themes/argonaut.sh | 2 +- themes/arthur.sh | 2 +- themes/atom.sh | 2 +- themes/azu.sh | 2 +- themes/belafonte-day.sh | 2 +- themes/belafonte-night.sh | 2 +- themes/bim.sh | 2 +- themes/birds-of-paradise.sh | 2 +- themes/blazer.sh | 2 +- themes/borland.sh | 2 +- themes/broadcast.sh | 2 +- themes/brogrammer.sh | 2 +- themes/c64.sh | 2 +- themes/cai.sh | 2 +- themes/chalk.sh | 2 +- themes/chalkboard.sh | 2 +- themes/ciapre.sh | 2 +- themes/clone-of-ubuntu.sh | 2 +- themes/clrs.sh | 2 +- themes/cobalt-neon.sh | 2 +- themes/cobalt2.sh | 2 +- themes/crayon-pony-fish.sh | 2 +- themes/dark-pastel.sh | 2 +- themes/darkside.sh | 2 +- themes/desert.sh | 2 +- themes/dimmed-monokai.sh | 2 +- themes/dracula.sh | 2 +- themes/earthsong.sh | 2 +- themes/elemental.sh | 2 +- themes/elementary.sh | 2 +- themes/elic.sh | 2 +- themes/elio.sh | 2 +- themes/espresso-libre.sh | 2 +- themes/espresso.sh | 2 +- themes/fishtank.sh | 2 +- themes/flat.sh | 2 +- themes/flatland.sh | 2 +- themes/foxnightly.sh | 2 +- themes/freya.sh | 2 +- themes/frontend-delight.sh | 2 +- themes/frontend-fun-forrest.sh | 2 +- themes/frontend-galaxy.sh | 2 +- themes/github.sh | 2 +- themes/gooey.sh | 2 +- themes/google-dark.sh | 2 +- themes/google-light.sh | 2 +- themes/grape.sh | 2 +- themes/grass.sh | 2 +- themes/gruvbox-dark.sh | 2 +- themes/gruvbox.sh | 2 +- themes/hardcore.sh | 2 +- themes/harper.sh | 2 +- themes/hemisu-dark.sh | 2 +- themes/hemisu-light.sh | 2 +- themes/highway.sh | 2 +- themes/hipster-green.sh | 2 +- themes/homebrew.sh | 2 +- themes/hurtado.sh | 2 +- themes/hybrid.sh | 2 +- themes/ic-green-ppl.sh | 2 +- themes/ic-orange-ppl.sh | 2 +- themes/idle-toes.sh | 2 +- themes/ir-black.sh | 2 +- themes/jackie-brown.sh | 2 +- themes/japanesque.sh | 2 +- themes/jellybeans.sh | 2 +- themes/jup.sh | 2 +- themes/kibble.sh | 2 +- themes/later-this-evening.sh | 2 +- themes/lavandula.sh | 2 +- themes/liquid-carbon-transparent.sh | 2 +- themes/liquid-carbon.sh | 2 +- themes/man-page.sh | 2 +- themes/mar.sh | 2 +- themes/material.sh | 2 +- themes/mathias.sh | 2 +- themes/medallion.sh | 2 +- themes/misterioso.sh | 2 +- themes/miu.sh | 2 +- themes/molokai.sh | 2 +- themes/mona-lisa.sh | 2 +- themes/monokai-dark.sh | 2 +- themes/monokai-soda.sh | 2 +- themes/n0tch2k.sh | 2 +- themes/neopolitan.sh | 2 +- themes/nep.sh | 2 +- themes/neutron.sh | 2 +- themes/nightlion-v1.sh | 2 +- themes/nightlion-v2.sh | 2 +- themes/nighty.sh | 2 +- themes/nord-light.sh | 2 +- themes/nord.sh | 2 +- themes/novel.sh | 2 +- themes/obsidian.sh | 2 +- themes/ocean-dark.sh | 2 +- themes/ocean.sh | 2 +- themes/oceanic-next.sh | 2 +- themes/ollie.sh | 2 +- themes/one-dark.sh | 2 +- themes/one-half-black.sh | 2 +- themes/one-light.sh | 2 +- themes/pali.sh | 2 +- themes/paraiso-dark.sh | 2 +- themes/paul-millr.sh | 2 +- themes/pencil-dark.sh | 2 +- themes/pencil-light.sh | 2 +- themes/peppermint.sh | 2 +- themes/pnevma.sh | 2 +- themes/pro.sh | 2 +- themes/red-alert.sh | 2 +- themes/red-sands.sh | 2 +- themes/rippedcasts.sh | 2 +- themes/royal.sh | 2 +- themes/sat.sh | 2 +- themes/sea-shells.sh | 2 +- themes/seafoam-pastel.sh | 2 +- themes/seti.sh | 2 +- themes/shaman.sh | 2 +- themes/shel.sh | 2 +- themes/slate.sh | 2 +- themes/smyck.sh | 2 +- themes/snazzy.sh | 2 +- themes/soft-server.sh | 2 +- themes/solarized-darcula.sh | 2 +- themes/solarized-dark-higher-contrast.sh | 3 ++- themes/solarized-dark.sh | 2 +- themes/solarized-light.sh | 2 +- themes/spacedust.sh | 2 +- themes/spacegray-eighties-dull.sh | 2 +- themes/spacegray-eighties.sh | 2 +- themes/spacegray.sh | 2 +- themes/spring.sh | 2 +- themes/square.sh | 2 +- themes/srcery.sh | 2 +- themes/sundried.sh | 2 +- themes/symphonic.sh | 2 +- themes/teerb.sh | 2 +- themes/terminal-basic.sh | 2 +- themes/terminix-dark.sh | 2 +- themes/thayer-bright.sh | 2 +- themes/tin.sh | 2 +- themes/tomorrow-night-blue.sh | 2 +- themes/tomorrow-night-bright.sh | 2 +- themes/tomorrow-night-eighties.sh | 2 +- themes/tomorrow-night.sh | 2 +- themes/tomorrow.sh | 2 +- themes/toy-chest.sh | 2 +- themes/treehouse.sh | 2 +- themes/twilight.sh | 2 +- themes/ura.sh | 2 +- themes/urple.sh | 2 +- themes/vag.sh | 2 +- themes/vaughn.sh | 2 +- themes/vibrant-ink.sh | 2 +- themes/warm-neon.sh | 2 +- themes/wez.sh | 2 +- themes/wild-cherry.sh | 2 +- themes/wombat.sh | 2 +- themes/wryan.sh | 2 +- themes/zenburn.sh | 2 +- 168 files changed, 170 insertions(+), 168 deletions(-) diff --git a/themes/3024-day.sh b/themes/3024-day.sh index 152e6ca..37f32bb 100755 --- a/themes/3024-day.sh +++ b/themes/3024-day.sh @@ -51,4 +51,5 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi + diff --git a/themes/3024-night.sh b/themes/3024-night.sh index 096d55e..0dd9738 100755 --- a/themes/3024-night.sh +++ b/themes/3024-night.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/_base.sh b/themes/_base.sh index 90161d2..211b16f 100755 --- a/themes/_base.sh +++ b/themes/_base.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/aci.sh b/themes/aci.sh index 93251b0..a341f02 100755 --- a/themes/aci.sh +++ b/themes/aci.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/aco.sh b/themes/aco.sh index c0634cd..b5d3bc9 100755 --- a/themes/aco.sh +++ b/themes/aco.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/adventuretime.sh b/themes/adventuretime.sh index 48b3696..1eeae30 100755 --- a/themes/adventuretime.sh +++ b/themes/adventuretime.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/afterglow.sh b/themes/afterglow.sh index bef6747..ece5f0f 100755 --- a/themes/afterglow.sh +++ b/themes/afterglow.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/alien-blood.sh b/themes/alien-blood.sh index f78faf9..fe5d8ec 100755 --- a/themes/alien-blood.sh +++ b/themes/alien-blood.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/argonaut.sh b/themes/argonaut.sh index 4744950..11a5762 100755 --- a/themes/argonaut.sh +++ b/themes/argonaut.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/arthur.sh b/themes/arthur.sh index 86e7e43..ccf6b7e 100755 --- a/themes/arthur.sh +++ b/themes/arthur.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/atom.sh b/themes/atom.sh index f1a603e..6275912 100755 --- a/themes/atom.sh +++ b/themes/atom.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/azu.sh b/themes/azu.sh index 4f26cdf..e7ad494 100755 --- a/themes/azu.sh +++ b/themes/azu.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/belafonte-day.sh b/themes/belafonte-day.sh index fd6462f..b8c41af 100755 --- a/themes/belafonte-day.sh +++ b/themes/belafonte-day.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/belafonte-night.sh b/themes/belafonte-night.sh index ca089c8..3161661 100755 --- a/themes/belafonte-night.sh +++ b/themes/belafonte-night.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/bim.sh b/themes/bim.sh index 14cd3d5..5eef0d5 100755 --- a/themes/bim.sh +++ b/themes/bim.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/birds-of-paradise.sh b/themes/birds-of-paradise.sh index 97ee053..8ffce97 100755 --- a/themes/birds-of-paradise.sh +++ b/themes/birds-of-paradise.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/blazer.sh b/themes/blazer.sh index fcd8cf9..498ba1d 100755 --- a/themes/blazer.sh +++ b/themes/blazer.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/borland.sh b/themes/borland.sh index 46e9535..d309d19 100755 --- a/themes/borland.sh +++ b/themes/borland.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/broadcast.sh b/themes/broadcast.sh index 8308ba7..4bdd476 100755 --- a/themes/broadcast.sh +++ b/themes/broadcast.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/brogrammer.sh b/themes/brogrammer.sh index a4ac49f..d716e42 100755 --- a/themes/brogrammer.sh +++ b/themes/brogrammer.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/c64.sh b/themes/c64.sh index a79c108..07ef942 100755 --- a/themes/c64.sh +++ b/themes/c64.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/cai.sh b/themes/cai.sh index 827c8fb..1e19cd3 100755 --- a/themes/cai.sh +++ b/themes/cai.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/chalk.sh b/themes/chalk.sh index 3df3948..5ee6a66 100755 --- a/themes/chalk.sh +++ b/themes/chalk.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/chalkboard.sh b/themes/chalkboard.sh index 587623d..e16a103 100755 --- a/themes/chalkboard.sh +++ b/themes/chalkboard.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ciapre.sh b/themes/ciapre.sh index 058825c..6324746 100755 --- a/themes/ciapre.sh +++ b/themes/ciapre.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/clone-of-ubuntu.sh b/themes/clone-of-ubuntu.sh index 5611627..450a8f6 100755 --- a/themes/clone-of-ubuntu.sh +++ b/themes/clone-of-ubuntu.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/clrs.sh b/themes/clrs.sh index d879328..e27a380 100755 --- a/themes/clrs.sh +++ b/themes/clrs.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/cobalt-neon.sh b/themes/cobalt-neon.sh index f670278..02d44e7 100755 --- a/themes/cobalt-neon.sh +++ b/themes/cobalt-neon.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/cobalt2.sh b/themes/cobalt2.sh index c17bb53..a91c509 100755 --- a/themes/cobalt2.sh +++ b/themes/cobalt2.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/crayon-pony-fish.sh b/themes/crayon-pony-fish.sh index 36508e1..67853d5 100755 --- a/themes/crayon-pony-fish.sh +++ b/themes/crayon-pony-fish.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/dark-pastel.sh b/themes/dark-pastel.sh index 0c93656..226136b 100755 --- a/themes/dark-pastel.sh +++ b/themes/dark-pastel.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/darkside.sh b/themes/darkside.sh index c574d2f..57b34f5 100755 --- a/themes/darkside.sh +++ b/themes/darkside.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/desert.sh b/themes/desert.sh index e25c6c8..755fc3e 100755 --- a/themes/desert.sh +++ b/themes/desert.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/dimmed-monokai.sh b/themes/dimmed-monokai.sh index 1d64adc..69200c8 100755 --- a/themes/dimmed-monokai.sh +++ b/themes/dimmed-monokai.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/dracula.sh b/themes/dracula.sh index ba0b208..a159e4f 100755 --- a/themes/dracula.sh +++ b/themes/dracula.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/earthsong.sh b/themes/earthsong.sh index 348069c..d7bbe25 100755 --- a/themes/earthsong.sh +++ b/themes/earthsong.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/elemental.sh b/themes/elemental.sh index be37948..cf9e422 100755 --- a/themes/elemental.sh +++ b/themes/elemental.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/elementary.sh b/themes/elementary.sh index fbe6a78..e17d7f3 100755 --- a/themes/elementary.sh +++ b/themes/elementary.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/elic.sh b/themes/elic.sh index efa6fb0..5c774f3 100755 --- a/themes/elic.sh +++ b/themes/elic.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/elio.sh b/themes/elio.sh index f49bdd7..113f354 100755 --- a/themes/elio.sh +++ b/themes/elio.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/espresso-libre.sh b/themes/espresso-libre.sh index bbf51f6..ba6b668 100755 --- a/themes/espresso-libre.sh +++ b/themes/espresso-libre.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/espresso.sh b/themes/espresso.sh index effa1fd..46ca019 100755 --- a/themes/espresso.sh +++ b/themes/espresso.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/fishtank.sh b/themes/fishtank.sh index 0953a1c..8c85527 100755 --- a/themes/fishtank.sh +++ b/themes/fishtank.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/flat.sh b/themes/flat.sh index ccd09c6..4bfcd79 100755 --- a/themes/flat.sh +++ b/themes/flat.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/flatland.sh b/themes/flatland.sh index d7ed282..2acaca2 100755 --- a/themes/flatland.sh +++ b/themes/flatland.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/foxnightly.sh b/themes/foxnightly.sh index ca385c1..1de06a8 100755 --- a/themes/foxnightly.sh +++ b/themes/foxnightly.sh @@ -52,4 +52,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/freya.sh b/themes/freya.sh index a751416..2765e06 100755 --- a/themes/freya.sh +++ b/themes/freya.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/frontend-delight.sh b/themes/frontend-delight.sh index a03e35c..8001b08 100755 --- a/themes/frontend-delight.sh +++ b/themes/frontend-delight.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/frontend-fun-forrest.sh b/themes/frontend-fun-forrest.sh index 82ea7a3..ec7e9de 100755 --- a/themes/frontend-fun-forrest.sh +++ b/themes/frontend-fun-forrest.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/frontend-galaxy.sh b/themes/frontend-galaxy.sh index 78a7ea1..ebeab50 100755 --- a/themes/frontend-galaxy.sh +++ b/themes/frontend-galaxy.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/github.sh b/themes/github.sh index 1ecb0fa..e2a9758 100755 --- a/themes/github.sh +++ b/themes/github.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/gooey.sh b/themes/gooey.sh index 068f0b6..1309b01 100755 --- a/themes/gooey.sh +++ b/themes/gooey.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/google-dark.sh b/themes/google-dark.sh index 98ad752..047b64e 100755 --- a/themes/google-dark.sh +++ b/themes/google-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/google-light.sh b/themes/google-light.sh index 52a03a9..b6bae7f 100755 --- a/themes/google-light.sh +++ b/themes/google-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/grape.sh b/themes/grape.sh index e904c15..78b7c54 100755 --- a/themes/grape.sh +++ b/themes/grape.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/grass.sh b/themes/grass.sh index 0ac9447..c21b6c4 100755 --- a/themes/grass.sh +++ b/themes/grass.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/gruvbox-dark.sh b/themes/gruvbox-dark.sh index 39234a7..5c1c81a 100755 --- a/themes/gruvbox-dark.sh +++ b/themes/gruvbox-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/gruvbox.sh b/themes/gruvbox.sh index b31d74e..77daea2 100755 --- a/themes/gruvbox.sh +++ b/themes/gruvbox.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hardcore.sh b/themes/hardcore.sh index 701c8fc..3f6cf24 100755 --- a/themes/hardcore.sh +++ b/themes/hardcore.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/harper.sh b/themes/harper.sh index c599e9f..0eaf935 100755 --- a/themes/harper.sh +++ b/themes/harper.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hemisu-dark.sh b/themes/hemisu-dark.sh index d3524e7..e16188d 100755 --- a/themes/hemisu-dark.sh +++ b/themes/hemisu-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hemisu-light.sh b/themes/hemisu-light.sh index 236ad88..be3c9bd 100755 --- a/themes/hemisu-light.sh +++ b/themes/hemisu-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/highway.sh b/themes/highway.sh index 0953653..7a1f6f2 100755 --- a/themes/highway.sh +++ b/themes/highway.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hipster-green.sh b/themes/hipster-green.sh index 87eea01..cd29c4f 100755 --- a/themes/hipster-green.sh +++ b/themes/hipster-green.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/homebrew.sh b/themes/homebrew.sh index 4134cb1..0930f35 100755 --- a/themes/homebrew.sh +++ b/themes/homebrew.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hurtado.sh b/themes/hurtado.sh index a4dbe3e..c8b14c2 100755 --- a/themes/hurtado.sh +++ b/themes/hurtado.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/hybrid.sh b/themes/hybrid.sh index 1c508d0..0263bdd 100755 --- a/themes/hybrid.sh +++ b/themes/hybrid.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ic-green-ppl.sh b/themes/ic-green-ppl.sh index fc34a1e..874e47b 100755 --- a/themes/ic-green-ppl.sh +++ b/themes/ic-green-ppl.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ic-orange-ppl.sh b/themes/ic-orange-ppl.sh index b1aa7f9..788d41c 100755 --- a/themes/ic-orange-ppl.sh +++ b/themes/ic-orange-ppl.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/idle-toes.sh b/themes/idle-toes.sh index 5f7bbf8..04c3347 100755 --- a/themes/idle-toes.sh +++ b/themes/idle-toes.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ir-black.sh b/themes/ir-black.sh index 25c0892..b659af8 100755 --- a/themes/ir-black.sh +++ b/themes/ir-black.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/jackie-brown.sh b/themes/jackie-brown.sh index 8f90e41..4489a6f 100755 --- a/themes/jackie-brown.sh +++ b/themes/jackie-brown.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/japanesque.sh b/themes/japanesque.sh index 2dd694d..f249933 100755 --- a/themes/japanesque.sh +++ b/themes/japanesque.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/jellybeans.sh b/themes/jellybeans.sh index ecd14cc..3ff14ab 100755 --- a/themes/jellybeans.sh +++ b/themes/jellybeans.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/jup.sh b/themes/jup.sh index 9963120..c4db23d 100755 --- a/themes/jup.sh +++ b/themes/jup.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/kibble.sh b/themes/kibble.sh index f0c7c8c..2a9c7e6 100755 --- a/themes/kibble.sh +++ b/themes/kibble.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/later-this-evening.sh b/themes/later-this-evening.sh index 378d76c..87d780a 100755 --- a/themes/later-this-evening.sh +++ b/themes/later-this-evening.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/lavandula.sh b/themes/lavandula.sh index 8689797..d407275 100755 --- a/themes/lavandula.sh +++ b/themes/lavandula.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/liquid-carbon-transparent.sh b/themes/liquid-carbon-transparent.sh index da96734..cc4cbe9 100755 --- a/themes/liquid-carbon-transparent.sh +++ b/themes/liquid-carbon-transparent.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/liquid-carbon.sh b/themes/liquid-carbon.sh index 4f973d5..8d5b93f 100755 --- a/themes/liquid-carbon.sh +++ b/themes/liquid-carbon.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/man-page.sh b/themes/man-page.sh index fc95c34..32b708b 100755 --- a/themes/man-page.sh +++ b/themes/man-page.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/mar.sh b/themes/mar.sh index 40b13ea..8186f7e 100755 --- a/themes/mar.sh +++ b/themes/mar.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/material.sh b/themes/material.sh index 69daef4..3ca4d57 100755 --- a/themes/material.sh +++ b/themes/material.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/mathias.sh b/themes/mathias.sh index 5cc260e..c518c46 100755 --- a/themes/mathias.sh +++ b/themes/mathias.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/medallion.sh b/themes/medallion.sh index e95cf06..be320a9 100755 --- a/themes/medallion.sh +++ b/themes/medallion.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/misterioso.sh b/themes/misterioso.sh index bb21960..effac70 100755 --- a/themes/misterioso.sh +++ b/themes/misterioso.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/miu.sh b/themes/miu.sh index 3194173..c0155dc 100755 --- a/themes/miu.sh +++ b/themes/miu.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/molokai.sh b/themes/molokai.sh index b96141f..a8c1b6e 100755 --- a/themes/molokai.sh +++ b/themes/molokai.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/mona-lisa.sh b/themes/mona-lisa.sh index 9614db6..a0dd4d1 100755 --- a/themes/mona-lisa.sh +++ b/themes/mona-lisa.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/monokai-dark.sh b/themes/monokai-dark.sh index 46b05b0..993728b 100755 --- a/themes/monokai-dark.sh +++ b/themes/monokai-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/monokai-soda.sh b/themes/monokai-soda.sh index 1f09683..4ca03b3 100755 --- a/themes/monokai-soda.sh +++ b/themes/monokai-soda.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/n0tch2k.sh b/themes/n0tch2k.sh index 7e52393..e3ef540 100755 --- a/themes/n0tch2k.sh +++ b/themes/n0tch2k.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/neopolitan.sh b/themes/neopolitan.sh index 00948eb..e09f865 100755 --- a/themes/neopolitan.sh +++ b/themes/neopolitan.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nep.sh b/themes/nep.sh index 5d8b626..af060e3 100755 --- a/themes/nep.sh +++ b/themes/nep.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/neutron.sh b/themes/neutron.sh index c145fa3..bc16ce0 100755 --- a/themes/neutron.sh +++ b/themes/neutron.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nightlion-v1.sh b/themes/nightlion-v1.sh index e10be29..a3211ea 100755 --- a/themes/nightlion-v1.sh +++ b/themes/nightlion-v1.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nightlion-v2.sh b/themes/nightlion-v2.sh index 9ce9050..4a42cc4 100755 --- a/themes/nightlion-v2.sh +++ b/themes/nightlion-v2.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nighty.sh b/themes/nighty.sh index 4f7fc0c..5cb8333 100755 --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nord-light.sh b/themes/nord-light.sh index 9ae62fb..0dc9405 100755 --- a/themes/nord-light.sh +++ b/themes/nord-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/nord.sh b/themes/nord.sh index 4e51a49..cd02de8 100755 --- a/themes/nord.sh +++ b/themes/nord.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/novel.sh b/themes/novel.sh index b16f9ab..6ce9c34 100755 --- a/themes/novel.sh +++ b/themes/novel.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/obsidian.sh b/themes/obsidian.sh index 3ec65bb..3c3744f 100755 --- a/themes/obsidian.sh +++ b/themes/obsidian.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ocean-dark.sh b/themes/ocean-dark.sh index 7d15195..8642a6b 100755 --- a/themes/ocean-dark.sh +++ b/themes/ocean-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ocean.sh b/themes/ocean.sh index 43bd155..25f52ab 100755 --- a/themes/ocean.sh +++ b/themes/ocean.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/oceanic-next.sh b/themes/oceanic-next.sh index aeafe74..0df1546 100755 --- a/themes/oceanic-next.sh +++ b/themes/oceanic-next.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ollie.sh b/themes/ollie.sh index 5865cc1..5dd2004 100755 --- a/themes/ollie.sh +++ b/themes/ollie.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/one-dark.sh b/themes/one-dark.sh index 0322e4f..7e9c08e 100755 --- a/themes/one-dark.sh +++ b/themes/one-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/one-half-black.sh b/themes/one-half-black.sh index 50a362a..064ab87 100755 --- a/themes/one-half-black.sh +++ b/themes/one-half-black.sh @@ -53,4 +53,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/one-light.sh b/themes/one-light.sh index 1981652..95f5560 100755 --- a/themes/one-light.sh +++ b/themes/one-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/pali.sh b/themes/pali.sh index a09cef7..30186cd 100755 --- a/themes/pali.sh +++ b/themes/pali.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/paraiso-dark.sh b/themes/paraiso-dark.sh index 5e327fc..bee1491 100755 --- a/themes/paraiso-dark.sh +++ b/themes/paraiso-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/paul-millr.sh b/themes/paul-millr.sh index 07f736a..326d52d 100755 --- a/themes/paul-millr.sh +++ b/themes/paul-millr.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/pencil-dark.sh b/themes/pencil-dark.sh index 68edd9e..a6acc38 100755 --- a/themes/pencil-dark.sh +++ b/themes/pencil-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/pencil-light.sh b/themes/pencil-light.sh index 9560889..da64092 100755 --- a/themes/pencil-light.sh +++ b/themes/pencil-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/peppermint.sh b/themes/peppermint.sh index f0f41b7..c9e1564 100755 --- a/themes/peppermint.sh +++ b/themes/peppermint.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/pnevma.sh b/themes/pnevma.sh index bc5dfa2..a02a75f 100755 --- a/themes/pnevma.sh +++ b/themes/pnevma.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/pro.sh b/themes/pro.sh index 3733507..0597211 100755 --- a/themes/pro.sh +++ b/themes/pro.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/red-alert.sh b/themes/red-alert.sh index 488238a..2f42f44 100755 --- a/themes/red-alert.sh +++ b/themes/red-alert.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/red-sands.sh b/themes/red-sands.sh index 6aa1d08..f73b82d 100755 --- a/themes/red-sands.sh +++ b/themes/red-sands.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/rippedcasts.sh b/themes/rippedcasts.sh index b9c6e13..0cb6365 100755 --- a/themes/rippedcasts.sh +++ b/themes/rippedcasts.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/royal.sh b/themes/royal.sh index 4e69607..2c7ab86 100755 --- a/themes/royal.sh +++ b/themes/royal.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/sat.sh b/themes/sat.sh index 92f4018..8cabc82 100755 --- a/themes/sat.sh +++ b/themes/sat.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/sea-shells.sh b/themes/sea-shells.sh index 3db6b69..b31929b 100755 --- a/themes/sea-shells.sh +++ b/themes/sea-shells.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/seafoam-pastel.sh b/themes/seafoam-pastel.sh index 3d8d495..54e48f4 100755 --- a/themes/seafoam-pastel.sh +++ b/themes/seafoam-pastel.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/seti.sh b/themes/seti.sh index f9e6e07..9fd78cb 100755 --- a/themes/seti.sh +++ b/themes/seti.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/shaman.sh b/themes/shaman.sh index 16bb9a8..83ebd05 100755 --- a/themes/shaman.sh +++ b/themes/shaman.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/shel.sh b/themes/shel.sh index fe45b3a..dfa4eac 100755 --- a/themes/shel.sh +++ b/themes/shel.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/slate.sh b/themes/slate.sh index a470acd..2750d0f 100755 --- a/themes/slate.sh +++ b/themes/slate.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/smyck.sh b/themes/smyck.sh index c0820df..72effa9 100755 --- a/themes/smyck.sh +++ b/themes/smyck.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/snazzy.sh b/themes/snazzy.sh index 47b6998..62811f6 100755 --- a/themes/snazzy.sh +++ b/themes/snazzy.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/soft-server.sh b/themes/soft-server.sh index d01855f..e8cc3b9 100755 --- a/themes/soft-server.sh +++ b/themes/soft-server.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/solarized-darcula.sh b/themes/solarized-darcula.sh index ff36ec7..3e97148 100755 --- a/themes/solarized-darcula.sh +++ b/themes/solarized-darcula.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/solarized-dark-higher-contrast.sh b/themes/solarized-dark-higher-contrast.sh index f7fd0c0..dc9af14 100755 --- a/themes/solarized-dark-higher-contrast.sh +++ b/themes/solarized-dark-higher-contrast.sh @@ -51,4 +51,5 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +^fi +$ \ No newline at end of file diff --git a/themes/solarized-dark.sh b/themes/solarized-dark.sh index 10838c1..e89bcd8 100755 --- a/themes/solarized-dark.sh +++ b/themes/solarized-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/solarized-light.sh b/themes/solarized-light.sh index cd206c5..494a93f 100755 --- a/themes/solarized-light.sh +++ b/themes/solarized-light.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/spacedust.sh b/themes/spacedust.sh index cb5bdf8..9b7b0b4 100755 --- a/themes/spacedust.sh +++ b/themes/spacedust.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/spacegray-eighties-dull.sh b/themes/spacegray-eighties-dull.sh index 10d240d..2f96bf8 100755 --- a/themes/spacegray-eighties-dull.sh +++ b/themes/spacegray-eighties-dull.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/spacegray-eighties.sh b/themes/spacegray-eighties.sh index 7287ff6..5b3d60d 100755 --- a/themes/spacegray-eighties.sh +++ b/themes/spacegray-eighties.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/spacegray.sh b/themes/spacegray.sh index 3b9b759..09f3c48 100755 --- a/themes/spacegray.sh +++ b/themes/spacegray.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/spring.sh b/themes/spring.sh index 7aad8f1..4495dca 100755 --- a/themes/spring.sh +++ b/themes/spring.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/square.sh b/themes/square.sh index 0eefef9..e91ba48 100755 --- a/themes/square.sh +++ b/themes/square.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/srcery.sh b/themes/srcery.sh index 1ca22fd..cd231ac 100755 --- a/themes/srcery.sh +++ b/themes/srcery.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/sundried.sh b/themes/sundried.sh index 0bdad98..eeeb3e0 100755 --- a/themes/sundried.sh +++ b/themes/sundried.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/symphonic.sh b/themes/symphonic.sh index e670a5b..f8f5b2d 100755 --- a/themes/symphonic.sh +++ b/themes/symphonic.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/teerb.sh b/themes/teerb.sh index f1c59db..e6eb0d2 100755 --- a/themes/teerb.sh +++ b/themes/teerb.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/terminal-basic.sh b/themes/terminal-basic.sh index 385a61b..99e1b22 100755 --- a/themes/terminal-basic.sh +++ b/themes/terminal-basic.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/terminix-dark.sh b/themes/terminix-dark.sh index 3897019..6e9f22b 100755 --- a/themes/terminix-dark.sh +++ b/themes/terminix-dark.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/thayer-bright.sh b/themes/thayer-bright.sh index cee460b..4b7b8e7 100755 --- a/themes/thayer-bright.sh +++ b/themes/thayer-bright.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tin.sh b/themes/tin.sh index 8805930..7e6cf8b 100755 --- a/themes/tin.sh +++ b/themes/tin.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tomorrow-night-blue.sh b/themes/tomorrow-night-blue.sh index 529c232..016d338 100755 --- a/themes/tomorrow-night-blue.sh +++ b/themes/tomorrow-night-blue.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tomorrow-night-bright.sh b/themes/tomorrow-night-bright.sh index cb091ee..89de71b 100755 --- a/themes/tomorrow-night-bright.sh +++ b/themes/tomorrow-night-bright.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tomorrow-night-eighties.sh b/themes/tomorrow-night-eighties.sh index 21d78d1..7541629 100755 --- a/themes/tomorrow-night-eighties.sh +++ b/themes/tomorrow-night-eighties.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tomorrow-night.sh b/themes/tomorrow-night.sh index 40ad4e0..b4bac87 100755 --- a/themes/tomorrow-night.sh +++ b/themes/tomorrow-night.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/tomorrow.sh b/themes/tomorrow.sh index e51c954..998c4fe 100755 --- a/themes/tomorrow.sh +++ b/themes/tomorrow.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/toy-chest.sh b/themes/toy-chest.sh index c591518..09d7a8f 100755 --- a/themes/toy-chest.sh +++ b/themes/toy-chest.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/treehouse.sh b/themes/treehouse.sh index 69d8fe8..00eae57 100755 --- a/themes/treehouse.sh +++ b/themes/treehouse.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/twilight.sh b/themes/twilight.sh index 3b51883..af94a99 100755 --- a/themes/twilight.sh +++ b/themes/twilight.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/ura.sh b/themes/ura.sh index eb9f5d3..3c9b00c 100755 --- a/themes/ura.sh +++ b/themes/ura.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/urple.sh b/themes/urple.sh index ec90aeb..6d91120 100755 --- a/themes/urple.sh +++ b/themes/urple.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/vag.sh b/themes/vag.sh index 5d2afa5..0a8ec8d 100755 --- a/themes/vag.sh +++ b/themes/vag.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/vaughn.sh b/themes/vaughn.sh index 27572ab..a783fed 100755 --- a/themes/vaughn.sh +++ b/themes/vaughn.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/vibrant-ink.sh b/themes/vibrant-ink.sh index 13e9670..acc87f5 100755 --- a/themes/vibrant-ink.sh +++ b/themes/vibrant-ink.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/warm-neon.sh b/themes/warm-neon.sh index 7ca78db..bc0c6ce 100755 --- a/themes/warm-neon.sh +++ b/themes/warm-neon.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/wez.sh b/themes/wez.sh index 1999f82..e2c9e0f 100755 --- a/themes/wez.sh +++ b/themes/wez.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/wild-cherry.sh b/themes/wild-cherry.sh index a86a385..3d6122b 100755 --- a/themes/wild-cherry.sh +++ b/themes/wild-cherry.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/wombat.sh b/themes/wombat.sh index 96f1982..7a7f063 100755 --- a/themes/wombat.sh +++ b/themes/wombat.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/wryan.sh b/themes/wryan.sh index 3f406cb..6e50c73 100755 --- a/themes/wryan.sh +++ b/themes/wryan.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi diff --git a/themes/zenburn.sh b/themes/zenburn.sh index cba3012..591a94a 100755 --- a/themes/zenburn.sh +++ b/themes/zenburn.sh @@ -51,4 +51,4 @@ else # Linux ships with wget bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" fi -fi \ No newline at end of file +fi From 01f998e9eeab6c3409ab7cc8dbb67a5b414ea89c Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Fri, 30 Nov 2018 23:03:39 +0100 Subject: [PATCH 23/25] Make sure exported variables get unset to avoid global variable pollution --- apply-colors.sh | 33 ++++++++++++++++++++++++++++++++- gogh.sh | 18 ++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index fdd130a..cc17c9f 100644 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -10,6 +10,35 @@ GS="${GS:-$(command -v gsettings | xargs echo)}" # Note: xargs echo is to make the command sucessful even if it was not # otherwise the script will exit if the command does not exist (elementary os) +# | +# | Make sure all exported variables get unset no matter what +# | Defining this in this script because it gets called even if +# | gogh.sh was not called. Exported variables in gogh.sh gets +# | handled there in case there was en error before this script was called +# | ============================================ +GLOBAL_VAR_CLEANUP() { + unset PROFILE_NAME + unset PROFILE_SLUG + unset scratchdir + unset TILIX_RES + unset TERMINAL + unset LOOP + unset OPTLENGTH + + for c in $(seq -s " " -w 16); do + unset DEMO_COLOR_${c} + unset COLOR_${c} + done + + unset BACKGROUND_COLOR + unset FOREGROUND_COLOR + unset CURSOR_COLOR + unset PROFILE_NAME +} + +# Note: Since all scripts gets invoked in a subshell the traps from the parent shell +# will not get inherited. Hence traps defined in gogh.sh and print-themes.sh will still trigger +trap 'GLOBAL_VAR_CLEANUP; trap - EXIT' EXIT HUP INT QUIT PIPE TERM # | # | Second test for TERMINAL in case user ran @@ -252,6 +281,7 @@ if [[ "${COLORTERM:-}" == "truecolor" ]] || [[ "${COLORTERM:-}" == "24bit" ]]; t [[ "$c" == "08" ]] && color_str+="\n" # new line done printf '\n%b\n\n\n' "${color_str}" + unset color_str } else function gogh_colors () { @@ -262,6 +292,7 @@ else [[ $c == 7 ]] && color_str+="\n" # new line done printf '\n%b\n\n' "${color_str}" + unset color_str } fi @@ -594,4 +625,4 @@ esac unset PROFILE_NAME unset PROFILE_SLUG -unset DEFAULT_SLUG \ No newline at end of file +unset DEFAULT_SLUG diff --git a/gogh.sh b/gogh.sh index 657ffc7..a6b3cf0 100755 --- a/gogh.sh +++ b/gogh.sh @@ -1,5 +1,16 @@ #!/usr/bin/env bash +# Define traps and trapfunctions early in case any errors before script exits +GLOBAL_VAR_CLEANUP(){ + [[ -n "$(command -v TILIX_TMP_CLEANUP)" ]] && TILIX_TMP_CLEANUP + unset PROFILE_NAME + unset PROFILE_SLUG + unset TILIX_RES + unset TERMINAL +} + +trap 'GLOBAL_VAR_CLEANUP; trap - EXIT' EXIT HUP INT QUIT PIPE TERM + declare -a THEMES=( '3024-day.sh' '3024-night.sh' @@ -341,18 +352,17 @@ if [[ "$TERMINAL" = "tilix" ]] && [[ ${#OPTION[@]} -gt 0 ]]; then # | desides to abort before all themes has been processed this section will cleanup the tmpdir # | ======================================= if [[ ${TILIX_RES::1} =~ ^(y|Y)$ ]]; then - cleanup() { + TILIX_TMP_CLEANUP() { echo echo "Cleaning up" rm -rf "$scratchdir" - unset LOOP OPTLENGTH + unset LOOP OPTLENGTH scratchdir echo "Done..." exit 0 } scratchdir=$(mktemp -d -t tmp.XXXXXXXX) export scratchdir - trap 'cleanup; trap - EXIT' EXIT HUP INT QUIT PIPE TERM fi fi @@ -400,4 +410,4 @@ for OP in "${OPTION[@]#0}"; do exit 1 fi done -command -v bar::stop > /dev/null && bar::stop || : \ No newline at end of file +command -v bar::stop > /dev/null && bar::stop || : From ef624d3ea9cd93d39b7a7b549ffb7206a962c7d0 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Fri, 30 Nov 2018 23:04:12 +0100 Subject: [PATCH 24/25] Cleanup code --- test/print-themes.sh | 64 +++++++++++--------------------- test/test.sh | 88 ++++++++++++-------------------------------- 2 files changed, 45 insertions(+), 107 deletions(-) diff --git a/test/print-themes.sh b/test/print-themes.sh index 0492184..95cb2c2 100755 --- a/test/print-themes.sh +++ b/test/print-themes.sh @@ -1,53 +1,33 @@ #!/usr/bin/env bash +trap 'unset GOGH_DRY_RUN; unset -f color; trap - EXIT' EXIT HUP INT QUIT PIPE TERM + if [[ "${COLORTERM:-}" != "truecolor" ]] && [[ "${COLORTERM:-}" != "24bit" ]]; then - echo "TrueColor support is needed for this to function" - echo "You can try to manually set COLORTERM to truecolor" + printf '%s\n' "TrueColor support is needed for this to function" \ + "You can try to manually set COLORTERM to truecolor" exit 1 fi -# Reset color -export RS="$(tput sgr0)" - # Print all themes without applying, this variable gets checked in apply-colors.sh -export GOGH_DRY_RUN=1 +export GOGH_DRY_RUN=1 color () { - # echo "" - #black - echo -e "${DEMO_COLOR_01} ███ *** AaBbCs --- ███ ${RS} ---> Color 01 'tput setaf 0'" - #red - echo -e "${DEMO_COLOR_02} ███ *** AaBbCs --- ███ ${RS} ---> Color 02 'tput setaf 1'" - #green - echo -e "${DEMO_COLOR_03} ███ *** AaBbCs --- ███ ${RS} ---> Color 03 'tput setaf 2'" - #yellow - echo -e "${DEMO_COLOR_04} ███ *** AaBbCs --- ███ ${RS} ---> Color 04 'tput setaf 3'" - #blue - echo -e "${DEMO_COLOR_05} ███ *** AaBbCs --- ███ ${RS} ---> Color 05 'tput setaf 4'" - #purple - echo -e "${DEMO_COLOR_06} ███ *** AaBbCs --- ███ ${RS} ---> Color 06 'tput setaf 5'" - #cyan - echo -e "${DEMO_COLOR_07} ███ *** AaBbCs --- ███ ${RS} ---> Color 07 'tput setaf 6'" - #white - echo -e "${DEMO_COLOR_08} ███ *** AaBbCs --- ███ ${RS} ---> Color 08 'tput setaf 7'" - echo "" - #black - echo -e "${DEMO_COLOR_09} ███ *** AaBbCs --- ███ ${RS} ---> Color 09 'tput setaf 8'" - #red - echo -e "${DEMO_COLOR_10} ███ *** AaBbCs --- ███ ${RS} ---> Color 10 'tput setaf 9'" - #green - echo -e "${DEMO_COLOR_11} ███ *** AaBbCs --- ███ ${RS} ---> Color 11 'tput setaf 10'" - #yellow - echo -e "${DEMO_COLOR_12} ███ *** AaBbCs --- ███ ${RS} ---> Color 12 'tput setaf 11'" - #blue - echo -e "${DEMO_COLOR_13} ███ *** AaBbCs --- ███ ${RS} ---> Color 13 'tput setaf 12'" - #purple - echo -e "${DEMO_COLOR_14} ███ *** AaBbCs --- ███ ${RS} ---> Color 14 'tput setaf 13'" - #cyan - echo -e "${DEMO_COLOR_15} ███ *** AaBbCs --- ███ ${RS} ---> Color 15 'tput setaf 14'" - #white - echo -e "${DEMO_COLOR_16} ███ *** AaBbCs --- ███ ${RS} ---> Color 16 'tput setaf 15'" - echo "" + printf '%b\n' "${DEMO_COLOR_01} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 01 'tput setaf 0'" # black + printf '%b\n' "${DEMO_COLOR_02} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 02 'tput setaf 1'" # red + printf '%b\n' "${DEMO_COLOR_03} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 03 'tput setaf 2'" # green + printf '%b\n' "${DEMO_COLOR_04} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 04 'tput setaf 3'" # yellow + printf '%b\n' "${DEMO_COLOR_05} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 05 'tput setaf 4'" # blue + printf '%b\n' "${DEMO_COLOR_06} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 06 'tput setaf 5'" # pruple + printf '%b\n' "${DEMO_COLOR_07} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 07 'tput setaf 6'" # cyan + printf '%b\n\n' "${DEMO_COLOR_08} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 08 'tput setaf 7'" # white + printf '%b\n' "${DEMO_COLOR_09} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 09 'tput setaf 8'" # bold black + printf '%b\n' "${DEMO_COLOR_10} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 10 'tput setaf 9'" # bold red + printf '%b\n' "${DEMO_COLOR_11} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 11 'tput setaf 10'" # bold green + printf '%b\n' "${DEMO_COLOR_12} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 12 'tput setaf 11'" # bold yellow + printf '%b\n' "${DEMO_COLOR_13} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 13 'tput setaf 12'" # bold blue + printf '%b\n' "${DEMO_COLOR_14} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 14 'tput setaf 13'" # bold purple + printf '%b\n' "${DEMO_COLOR_15} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 15 'tput setaf 14'" # bold cyan + printf '%b\n\n' "${DEMO_COLOR_16} ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 16 'tput setaf 15'" # bold white } export -f color @@ -293,5 +273,3 @@ LOOP=$((${LOOP:-(-1)}+1)) command -v bar::status_changed > /dev/null && bar::status_changed $LOOP ${#THEMES[@]} command -v bar::stop > /dev/null && bar::stop || : - -unset GOGH_DRY_RUN \ No newline at end of file diff --git a/test/test.sh b/test/test.sh index 1fab4d2..e8694b4 100644 --- a/test/test.sh +++ b/test/test.sh @@ -1,71 +1,31 @@ #!/usr/bin/env bash -# Reset color -RS="\e[0m" -# Basic Colors -BLACK="\e[0;30m" -RED="\e[0;31m" -GREEN="\e[0;32m" -YELLOW="\e[0;33m" -BLUE="\e[0;34m" -PURPLE="\e[0;35m" -CYAN="\e[0;36m" -WHITE="\e[0;37m" - - -function_message_title () { - echo "" - echo "" - echo "" - echo "" - echo "" - echo -e "${CYAN}" - echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" - echo -e "# | ${RS} $1 ${CYAN}" - echo -e "# | ::::::::::::::::::::::::::::::::::::::::::::: | #" - echo -e "${RS}" -} - - color () { - # echo "" - #black - echo -e "\e[0;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 01 0;30m" - #red - echo -e "\e[0;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 02 0;31m" - #green - echo -e "\e[0;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 03 0;32m" - #yellow - echo -e "\e[0;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 04 0;33m" - #blue - echo -e "\e[0;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 05 0;34m" - #purple - echo -e "\e[0;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 06 0;35m" - #cyan - echo -e "\e[0;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 07 0;36m" - #white - echo -e "\e[0;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 08 0;37m" - echo "" - #black - echo -e "\e[1;30m ███ *** AaBbCs --- ███ \\e[0m ---> Color 09 1;30m" - #red - echo -e "\e[1;31m ███ *** AaBbCs --- ███ \\e[0m ---> Color 10 1;31m" - #green - echo -e "\e[1;32m ███ *** AaBbCs --- ███ \\e[0m ---> Color 11 1;32m" - #yellow - echo -e "\e[1;33m ███ *** AaBbCs --- ███ \\e[0m ---> Color 12 1;33m" - #blue - echo -e "\e[1;34m ███ *** AaBbCs --- ███ \\e[0m ---> Color 13 1;34m" - #purple - echo -e "\e[1;35m ███ *** AaBbCs --- ███ \\e[0m ---> Color 14 1;35m" - #cyan - echo -e "\e[1;36m ███ *** AaBbCs --- ███ \\e[0m ---> Color 15 1;36m" - #white - echo -e "\e[1;37m ███ *** AaBbCs --- ███ \\e[0m ---> Color 16 1;37m" - echo "" - echo -e "\e[0;30m█████\\e[0m\e[0;31m█████\\e[0m\e[0;32m█████\\e[0m\e[0;33m█████\\e[0m\e[0;34m█████\\e[0m\e[0;35m█████\\e[0m\e[0;36m█████\\e[0m\e[0;37m█████\\e[0m" - echo -e "\e[0m\e[1;30m█████\\e[0m\e[1;31m█████\\e[0m\e[1;32m█████\\e[0m\e[1;33m█████\\e[0m\e[1;34m█████\\e[0m\e[1;35m█████\\e[0m\e[1;36m█████\\e[0m\e[1;37m█████\\e[0m" + printf '%s\n' "$(tput setaf 0 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 01 'tput setaf 0'" # black + printf '%s\n' "$(tput setaf 1 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 02 'tput setaf 1'" # red + printf '%s\n' "$(tput setaf 2 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 03 'tput setaf 2'" # green + printf '%s\n' "$(tput setaf 3 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 04 'tput setaf 3'" # yellow + printf '%s\n' "$(tput setaf 4 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 05 'tput setaf 4'" # blue + printf '%s\n' "$(tput setaf 5 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 06 'tput setaf 5'" # pruple + printf '%s\n' "$(tput setaf 6 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 07 'tput setaf 6'" # cyan + printf '%s\n\n' "$(tput setaf 7 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 08 'tput setaf 7'" # white + printf '%s\n' "$(tput setaf 8 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 09 'tput setaf 8'" # bold black + printf '%s\n' "$(tput setaf 9 ) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 10 'tput setaf 9'" # bold red + printf '%s\n' "$(tput setaf 10) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 11 'tput setaf 10'" # bold green + printf '%s\n' "$(tput setaf 11) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 12 'tput setaf 11'" # bold yellow + printf '%s\n' "$(tput setaf 12) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 13 'tput setaf 12'" # bold blue + printf '%s\n' "$(tput setaf 13) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 14 'tput setaf 13'" # bold purple + printf '%s\n' "$(tput setaf 14) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 15 'tput setaf 14'" # bold cyan + printf '%s\n\n' "$(tput setaf 15) ███ *** AaBbCs --- ███ $(tput sgr0) ---> Color 16 'tput setaf 15'" # bold white + + local color_str + for c in {0..15}; do + color_dot_str+="$(tput setaf $c)•$(tput sgr0)" + [[ $c == 7 ]] && color_dot_str+=" " + done + printf '%s\n' "$color_str" + unset color_str } From 8043e61dfc2ff18f5ad63ee75239ca7f5340a9a4 Mon Sep 17 00:00:00 2001 From: phenonymous <29523105+phenonymous@users.noreply.github.com> Date: Fri, 30 Nov 2018 23:05:18 +0100 Subject: [PATCH 25/25] Add google themes in separate PR --- themes/google-dark.sh | 54 ------------------------------------------ themes/google-light.sh | 54 ------------------------------------------ 2 files changed, 108 deletions(-) delete mode 100755 themes/google-dark.sh delete mode 100755 themes/google-light.sh diff --git a/themes/google-dark.sh b/themes/google-dark.sh deleted file mode 100755 index 047b64e..0000000 --- a/themes/google-dark.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -# ====================CONFIG THIS =============================== # -export COLOR_01="#1D1F21" # Black -export COLOR_02="#CC342B" # Red -export COLOR_03="#198844" # Green -export COLOR_04="#FBA922" # Yellow -export COLOR_05="#3971ED" # Blue -export COLOR_06="#A36AC7" # Cyan -export COLOR_07="#3971ED" # Magenta -export COLOR_08="#C5C8C6" # Light gray - -export COLOR_09="#969896" # Dark gray -export COLOR_10="#CC342B" # Light Red -export COLOR_11="#198844" # Light Green -export COLOR_12="#FBA922" # Light Yellow -export COLOR_13="#3971ED" # Light Blue -export COLOR_14="#A36AC7" # Light Cyan -export COLOR_15="#3971ED" # Light Magenta -export COLOR_16="#FFFFFF" # White - -export BACKGROUND_COLOR="#1D1F21" # Background Color -export FOREGROUND_COLOR="#B4B7B4" # Foreground Color (text) -export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -export PROFILE_NAME="base16: Google (dark)" -# ============================================= - - - - - - - -# =============================================================== # -# | Apply Colors -# ===============================================================|# -SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" -PARENT_PATH="$(dirname "${SCRIPT_PATH}")" - -# Allow developer to change url to forked url for easier testing -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} - - -if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then - bash "${PARENT_PATH}/apply-colors.sh" -else - if [[ "$(uname)" = "Darwin" ]]; then - # OSX ships with curl and ancient bash - bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" - else - # Linux ships with wget - bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" - fi -fi diff --git a/themes/google-light.sh b/themes/google-light.sh deleted file mode 100755 index b6bae7f..0000000 --- a/themes/google-light.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -# ====================CONFIG THIS =============================== # -export COLOR_01="#FFFFFF" # Black -export COLOR_02="#CC342B" # Red -export COLOR_03="#198844" # Green -export COLOR_04="#FBA921" # Yellow -export COLOR_05="#3870ED" # Blue -export COLOR_06="#A26AC7" # Cyan -export COLOR_07="#3870ED" # Magenta -export COLOR_08="#373B41" # Light gray - -export COLOR_09="#C5C8C6" # Dark gray -export COLOR_10="#CC342B" # Light Red -export COLOR_11="#198844" # Light Green -export COLOR_12="#FBA921" # Light Yellow -export COLOR_13="#3870ED" # Light Blue -export COLOR_14="#A26AC7" # Light Cyan -export COLOR_15="#3870ED" # Light Magenta -export COLOR_16="#1D1F21" # White - -export BACKGROUND_COLOR="#FFFFFF" # Background Color -export FOREGROUND_COLOR="#969896" # Foreground Color (text) -export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -export PROFILE_NAME="base16: Google (light)" -# ============================================= - - - - - - - -# =============================================================== # -# | Apply Colors -# ===============================================================|# -SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}" -PARENT_PATH="$(dirname "${SCRIPT_PATH}")" - -# Allow developer to change url to forked url for easier testing -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} - - -if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then - bash "${PARENT_PATH}/apply-colors.sh" -else - if [[ "$(uname)" = "Darwin" ]]; then - # OSX ships with curl and ancient bash - bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")" - else - # Linux ships with wget - bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")" - fi -fi