From e373458abca49927e3d86fb3f029ad9df5b474b2 Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati Date: Thu, 14 Mar 2019 11:29:32 +0100 Subject: [PATCH 1/6] Add ibm3270 theme Added a theme derived from the 3270 Terminal's color palette --- themes/ibm3270.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 themes/ibm3270.sh diff --git a/themes/ibm3270.sh b/themes/ibm3270.sh new file mode 100644 index 0000000..8de1a2a --- /dev/null +++ b/themes/ibm3270.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +# ====================CONFIG THIS =============================== # +export COLOR_01="##222222" # Black +export COLOR_02="##F01818" # Red +export COLOR_03="##24D830" # Green +export COLOR_04="##F0D824" # Yellow +export COLOR_05="##7890F0" # Blue +export COLOR_06="##F078D8" # Magenta +export COLOR_07="##54E4E4" # Cyan +export COLOR_08="##BBBBBB" # Light gray + +export COLOR_09="##888888" # Dark gray +export COLOR_10="##EF8383" # Light Red +export COLOR_11="##7ED684" # Light Green +export COLOR_12="##EFE28B" # Light Yellow +export COLOR_13="##B3BFEF" # Light Blue +export COLOR_14="##EFB3E3" # Light Magenta +export COLOR_15="##9CE2E2" # Light Cyan +export COLOR_16="##FFFFFF" # White + +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#A5A5A5" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="ibm3270" +# =============================================================== # + + + + + + + +# =============================================================== # +# | 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 +# IMPORTANT: Make sure you export this variable if your main shell is not bash +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/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 From f2612af6fd38e4fc40477f69beb3f13a7bef23fa Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati <35559767+jack23247@users.noreply.github.com> Date: Thu, 14 Mar 2019 11:32:02 +0100 Subject: [PATCH 2/6] Added hook for ibm3270.sh --- gogh.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gogh.sh b/gogh.sh index 63ca57f..d5e47db 100755 --- a/gogh.sh +++ b/gogh.sh @@ -78,6 +78,7 @@ declare -a THEMES=( 'homebrew.sh' 'hurtado.sh' 'hybrid.sh' + 'ibm3270.sh' 'ic-green-ppl.sh' 'ic-orange-ppl.sh' 'idle-toes.sh' From ab9b199a4d66f71427acabf6ea185730651ddcfd Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati Date: Thu, 14 Mar 2019 11:51:30 +0100 Subject: [PATCH 3/6] Fixed ibm3270 scheme colors --- themes/ibm3270.sh | 32 +++++++++++++-------------- themes/ibm3270.sh~ | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 themes/ibm3270.sh~ diff --git a/themes/ibm3270.sh b/themes/ibm3270.sh index 8de1a2a..e8e4c00 100644 --- a/themes/ibm3270.sh +++ b/themes/ibm3270.sh @@ -1,23 +1,23 @@ #!/usr/bin/env bash # ====================CONFIG THIS =============================== # -export COLOR_01="##222222" # Black -export COLOR_02="##F01818" # Red -export COLOR_03="##24D830" # Green -export COLOR_04="##F0D824" # Yellow -export COLOR_05="##7890F0" # Blue -export COLOR_06="##F078D8" # Magenta -export COLOR_07="##54E4E4" # Cyan -export COLOR_08="##BBBBBB" # Light gray +export COLOR_01="#222222" # Black +export COLOR_02="#F01818" # Red +export COLOR_03="#24D830" # Green +export COLOR_04="#F0D824" # Yellow +export COLOR_05="#7890F0" # Blue +export COLOR_06="#F078D8" # Magenta +export COLOR_07="#54E4E4" # Cyan +export COLOR_08="#BBBBBB" # Light gray -export COLOR_09="##888888" # Dark gray -export COLOR_10="##EF8383" # Light Red -export COLOR_11="##7ED684" # Light Green -export COLOR_12="##EFE28B" # Light Yellow -export COLOR_13="##B3BFEF" # Light Blue -export COLOR_14="##EFB3E3" # Light Magenta -export COLOR_15="##9CE2E2" # Light Cyan -export COLOR_16="##FFFFFF" # White +export COLOR_09="#888888" # Dark gray +export COLOR_10="#EF8383" # Light Red +export COLOR_11="#7ED684" # Light Green +export COLOR_12="#EFE28B" # Light Yellow +export COLOR_13="#B3BFEF" # Light Blue +export COLOR_14="#EFB3E3" # Light Magenta +export COLOR_15="#9CE2E2" # Light Cyan +export COLOR_16="#FFFFFF" # White export BACKGROUND_COLOR="#000000" # Background Color export FOREGROUND_COLOR="#A5A5A5" # Foreground Color (text) diff --git a/themes/ibm3270.sh~ b/themes/ibm3270.sh~ new file mode 100644 index 0000000..8de1a2a --- /dev/null +++ b/themes/ibm3270.sh~ @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +# ====================CONFIG THIS =============================== # +export COLOR_01="##222222" # Black +export COLOR_02="##F01818" # Red +export COLOR_03="##24D830" # Green +export COLOR_04="##F0D824" # Yellow +export COLOR_05="##7890F0" # Blue +export COLOR_06="##F078D8" # Magenta +export COLOR_07="##54E4E4" # Cyan +export COLOR_08="##BBBBBB" # Light gray + +export COLOR_09="##888888" # Dark gray +export COLOR_10="##EF8383" # Light Red +export COLOR_11="##7ED684" # Light Green +export COLOR_12="##EFE28B" # Light Yellow +export COLOR_13="##B3BFEF" # Light Blue +export COLOR_14="##EFB3E3" # Light Magenta +export COLOR_15="##9CE2E2" # Light Cyan +export COLOR_16="##FFFFFF" # White + +export BACKGROUND_COLOR="#000000" # Background Color +export FOREGROUND_COLOR="#A5A5A5" # Foreground Color (text) +export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +export PROFILE_NAME="ibm3270" +# =============================================================== # + + + + + + + +# =============================================================== # +# | 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 +# IMPORTANT: Make sure you export this variable if your main shell is not bash +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/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 From 7e2b772862e00e83d5d3617a51eeecc66fb9a4eb Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati Date: Thu, 14 Mar 2019 11:54:15 +0100 Subject: [PATCH 4/6] Tweak hues on ibm3270 scheme More distinguishable white and light gray hues --- themes/ibm3270.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/ibm3270.sh b/themes/ibm3270.sh index e8e4c00..78e47c3 100644 --- a/themes/ibm3270.sh +++ b/themes/ibm3270.sh @@ -8,7 +8,7 @@ export COLOR_04="#F0D824" # Yellow export COLOR_05="#7890F0" # Blue export COLOR_06="#F078D8" # Magenta export COLOR_07="#54E4E4" # Cyan -export COLOR_08="#BBBBBB" # Light gray +export COLOR_08="#A5A5A5" # Light gray export COLOR_09="#888888" # Dark gray export COLOR_10="#EF8383" # Light Red @@ -20,7 +20,7 @@ export COLOR_15="#9CE2E2" # Light Cyan export COLOR_16="#FFFFFF" # White export BACKGROUND_COLOR="#000000" # Background Color -export FOREGROUND_COLOR="#A5A5A5" # Foreground Color (text) +export FOREGROUND_COLOR="#FDFDFD" # Foreground Color (text) export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color export PROFILE_NAME="ibm3270" # =============================================================== # From c90aaa5b78ba6ddd5402251a73f85639a5365f47 Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati <35559767+jack23247@users.noreply.github.com> Date: Thu, 14 Mar 2019 14:02:45 +0100 Subject: [PATCH 5/6] Patch URL --- gogh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gogh.sh b/gogh.sh index d5e47db..9d5b06c 100755 --- a/gogh.sh +++ b/gogh.sh @@ -184,7 +184,7 @@ declare -a THEMES=( ) # Allow developer to change url to forked url for easier testing -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/Gogh/master"} PROGRESS_URL="https://raw.githubusercontent.com/phenonymous/shell-progressbar/1.0/progress.sh" capitalize() { From fedf26db2a0413a3f40dbb817bd6e695e769bfcf Mon Sep 17 00:00:00 2001 From: Jacopo Maltagliati Date: Thu, 14 Mar 2019 19:24:36 +0100 Subject: [PATCH 6/6] Revert URL patches for PR --- gogh.sh | 2 +- themes/ibm3270.sh | 2 +- themes/ibm3270.sh~ | 55 ---------------------------------------------- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 themes/ibm3270.sh~ diff --git a/gogh.sh b/gogh.sh index 9d5b06c..d5e47db 100755 --- a/gogh.sh +++ b/gogh.sh @@ -184,7 +184,7 @@ declare -a THEMES=( ) # Allow developer to change url to forked url for easier testing -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/Gogh/master"} +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} PROGRESS_URL="https://raw.githubusercontent.com/phenonymous/shell-progressbar/1.0/progress.sh" capitalize() { diff --git a/themes/ibm3270.sh b/themes/ibm3270.sh index 78e47c3..f0ee733 100644 --- a/themes/ibm3270.sh +++ b/themes/ibm3270.sh @@ -39,7 +39,7 @@ PARENT_PATH="$(dirname "${SCRIPT_PATH}")" # Allow developer to change url to forked url for easier testing # IMPORTANT: Make sure you export this variable if your main shell is not bash -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/Gogh/master"} +BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"} if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then diff --git a/themes/ibm3270.sh~ b/themes/ibm3270.sh~ deleted file mode 100644 index 8de1a2a..0000000 --- a/themes/ibm3270.sh~ +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# ====================CONFIG THIS =============================== # -export COLOR_01="##222222" # Black -export COLOR_02="##F01818" # Red -export COLOR_03="##24D830" # Green -export COLOR_04="##F0D824" # Yellow -export COLOR_05="##7890F0" # Blue -export COLOR_06="##F078D8" # Magenta -export COLOR_07="##54E4E4" # Cyan -export COLOR_08="##BBBBBB" # Light gray - -export COLOR_09="##888888" # Dark gray -export COLOR_10="##EF8383" # Light Red -export COLOR_11="##7ED684" # Light Green -export COLOR_12="##EFE28B" # Light Yellow -export COLOR_13="##B3BFEF" # Light Blue -export COLOR_14="##EFB3E3" # Light Magenta -export COLOR_15="##9CE2E2" # Light Cyan -export COLOR_16="##FFFFFF" # White - -export BACKGROUND_COLOR="#000000" # Background Color -export FOREGROUND_COLOR="#A5A5A5" # Foreground Color (text) -export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color -export PROFILE_NAME="ibm3270" -# =============================================================== # - - - - - - - -# =============================================================== # -# | 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 -# IMPORTANT: Make sure you export this variable if your main shell is not bash -BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/jack23247/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