Add reset themes

.gitignore

@@ -0,0 +1,4 @@
+paul/*
+powerline/*
+*.orig
+*~

Makefile

@@ -1,15 +1,40 @@
-BUILDER := bin/build-theme
-THEME_SRC := $(shell find src -name '*.tmuxtheme')
-INCLUDES := $(shell find src -name '*.tmuxsh')
-THEMES := $(patsubst src/%,%,$(THEME_SRC))
-TESTS := $(addsuffix .test,$(THEMES))
+BUILDER    := bin/build-theme
+MINIFY     := bin/MinifyTheme
+INSTALLDIR := $(HOME)/.tmux/plugins/tmux-themepack
+RSYNC      := $(shell command -v rsync)
+RSYNCARGS  := -ac --cvs-exclude --info=STATS,PROGRESS2
+# Paul Themes
+PAUL_THEME_SRC  := $(shell find src/paul -name '*.tmuxtheme')
+PAUL_INCLUDES   := $(shell find src/paul -name '*.tmuxsh')
+PAUL_THEMES     := $(patsubst src/%,%,$(PAUL_THEME_SRC))
+PAUL_TESTS      := $(addsuffix .test,$(PAUL_THEMES))
+
+# Powerline Themes
+PL_THEME_SRC  := $(shell find src/powerline -name '*.tmuxtheme')
+PL_INCLUDES   := $(shell find src/powerline -name '*.tmuxsh')
+PL_THEMES     := $(patsubst src/%,%,$(PL_THEME_SRC))
+PL_TESTS      := $(addsuffix .test,$(PL_THEMES))
+
+# 10 jobs in parallel
+MAKEFLAGS += -j10
 
 .PHONY: build
-build: $(THEMES)
+build: $(PAUL_THEMES) $(PL_THEMES)
+
+.PHONY: install
+install: $(PAUL_THEMES) $(PL_THEMES)
+	@echo Rsyncing
+	@$(RSYNC) $(RSYNCARGS) ./ $(INSTALLDIR)
+	@echo Minify installed files
+	@$(MINIFY)  $(INSTALLDIR)
+	@echo Cleanup .bak files
+	@find $(INSTALLDIR) -name "*.bak" -not -path "src/*" -exec rm {} +
 
 .PHONY: clean
 clean:
-	rm $(shell find * -name "*.tmuxtheme" -not -path "src/*")
+	find * -name "*.tmuxtheme" -not -path "src/*" -print -exec rm {} +
+	find * -name "*.bak" -not -path "src/*" -print -exec rm {} +
+	find $(INSTALLDIR) -name "*.bak" -not -path "src/*" -print -exec rm {} +
 
 .PHONY: lint
 lint:
@@ -21,11 +46,35 @@ test: needs-build
 
 .PHONY: needs-build
 needs-build:
-	$(foreach file,$(THEMES), \
+	$(foreach file,$(PAUL_THEMES), \
+		$(BUILDER) "src/$(file)" | diff -q "$(file)" - && \
+	) true
+	$(foreach file,$(PL_THEMES), \
 		$(BUILDER) "src/$(file)" | diff -q "$(file)" - && \
 	) true
 
-$(THEMES): %.tmuxtheme: src/%.tmuxtheme $(INCLUDES)
+.PHONY: testmake
+testmake :
+	@printf "PAUL_THEME_SRC=$(PAUL_THEME_SRC)\n\n"
+	@printf "PAUL_INCLUDES=$(PAUL_INCLUDES)\n\n"
+	@printf "PAUL_THEMES=$(PAUL_THEMES)\n\n"
+	@printf "PL_THEME_SRC=$(PL_THEME_SRC)\n\n"
+	@printf "PL_INCLUDES=$(PL_INCLUDES)\n\n"
+	@printf "PL_THEMES=$(PL_THEMES)\n\n"
+
+# .SILENT: $(PAUL_THEMES)
+$(PAUL_THEMES): %.tmuxtheme: src/%.tmuxtheme $(PAUL_INCLUDES)
+	$(BUILDER) "src/$@" "$@"
+
+# .SILENT: $(PL_THEMES)
+$(PL_THEMES): %.tmuxtheme: src/%.tmuxtheme $(PL_INCLUDES)
 	$(BUILDER) "src/$@" "$@"
 
-$(TESTS): %.test: src/%.test
+$(PAUL_TESTS): %.test: src/%.test
+$(PL_TESTS): %.test: src/%.test
+
+.PHONY: list
+list:
+	@LC_ALL=C $(MAKE) -pRrq -f $(firstword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/(^|\n)# Files(\n|$$)/,/(^|\n)# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
+
+#  vim: set ai et nu cin sts=0 sw=8 ts=8 tw=78 filetype=make :

SetEnv

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+DEBUG=0
+# Set SOURCED=1 if script must be sourced
+SOURCED=1
+_R=$(tput setaf 1) # Red
+_G=$(tput setaf 2) # Green
+_Y=$(tput setaf 3) # Yellow
+_B=$(tput setaf 4) # Blue
+_N=$(tput rmso; tput sgr0; tput setaf 7) # Color Off
+if ((SOURCED>0))
+then
+  (return 0 2>/dev/null) && sourced=true || sourced=false
+
+    # Exit if script is not sourced.
+    if [[ ${sourced} == false ]]; then
+      echo -e "${_R}Error:${_N} This script cannot be executed directly, it must be sourced.\n"
+      echo -e "Try running"
+      echo -e "${_G}source ${0}${_N}"
+      echo -e "or"
+      echo -e "${_G}. ${0}${_N}"
+      # can also call Usage()
+    fi
+fi
+
+export BASE=$HOME/Projects/tmux-themepack
+export INSTALLDIR="$HOME/.tmux/plugins/tmux-themepack"
+((DEBUG>0)) && printf "pathmunge %s after\n" "$BASE/bin" >&2
+pathmunge $BASE/bin after
+# vim: set ai et nu cin sts=2 sw=2 ts=2 tw=78 filetype=sh :

Tools/FixTemplate.bash

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+BASE="/home/pjoslin/Projects/TMUXTHEMES/tmux-themepack/src"
+
+for i in *;
+do
+    if [ -f "$i" ] ;
+    then
+        DIR=$PWD
+        DIR=${DIR##$BASE}
+        mv $i /tmp ;
+        echo "#################### File: $DIR/$i" >> $i ;
+        grep -v "File: " /tmp/$i >> $i ;
+        echo "#################### End File: $DIR/$i" >> $i ;
+        fi ;
+    done
+    # vim: set ai et nu cin sts=4 sw=4 ts=4 tw=78 filetype=sh :

Tools/Reset.all

@@ -0,0 +1,180 @@
+set -gu @theme-clock-mode-colour
+set -gu @theme-clock-mode-style
+set -gu @theme-display-panes-active-colour
+set -gu @theme-display-panes-colour
+set -gu @theme-message-bg
+set -gu @theme-message-command-bg
+set -gu @theme-message-command-fg
+set -gu @theme-message-fg
+set -gu @theme-mode-bg
+set -gu @theme-mode-fg
+set -gu @theme-pane-active-border-bg
+set -gu @theme-pane-active-border-fg
+set -gu @theme-pane-border-bg
+set -gu @theme-pane-border-fg
+set -gu @theme-status-bg
+set -gu @theme-status-fg
+set -gu @theme-status-interval
+set -gu @theme-status-justify
+set -gu @theme-status-left
+set -gu @theme-status-left-bg
+set -gu @theme-status-left-fg
+set -gu @theme-status-left-length
+set -gu @theme-status-left-prefix
+set -gu @theme-status-left-suffix
+set -gu @theme-status-right
+set -gu @theme-status-right-bg
+set -gu @theme-status-right-fg
+set -gu @theme-status-right-length
+set -gu @theme-status-right-prefix
+set -gu @theme-status-right-suffix
+set -gu @theme-window-status-activity-bg
+set -gu @theme-window-status-activity-fg
+set -gu @theme-window-status-bell-style
+set -gu @theme-window-status-current-bg
+set -gu @theme-window-status-current-fg
+set -gu @theme-window-status-current-format
+set -gu @theme-window-status-current-prefix
+set -gu @theme-window-status-current-suffix
+set -gu @theme-window-status-format
+set -gu @theme-window-status-prefix
+set -gu @theme-window-status-separator
+set -gu @theme-window-status-suffix
+set -guF pane-border-format
+set -gu @paul-color-black-1
+set -gu @paul-color-grey-1
+set -gu @paul-color-grey-2
+set -gu @paul-color-grey-3
+set -gu @paul-color-grey-4
+set -gu @paul-color-grey-5
+set -gu @paul-color-grey-6
+set -gu @paul-color-main-1
+set -gu @paul-color-main-2
+set -gu @paul-color-main-3
+set -gu @powerline-color-black-1
+set -gu @powerline-color-grey-1
+set -gu @powerline-color-grey-2
+set -gu @powerline-color-grey-3
+set -gu @powerline-color-grey-4
+set -gu @powerline-color-grey-5
+set -gu @powerline-color-grey-6
+set -gu @powerline-color-main-1
+set -gu @powerline-color-main-2
+set -gu @powerline-color-main-3
+set -gu @themepack-status-left-area-left-format
+set -gu @themepack-status-left-area-left-prefix
+set -gu @themepack-status-left-area-left-suffix
+set -gu @themepack-status-left-area-middle-format
+set -gu @themepack-status-left-area-middle-prefix
+set -gu @themepack-status-left-area-middle-suffix
+set -gu @themepack-status-left-area-right-format
+set -gu @themepack-status-left-area-right-prefix
+set -gu @themepack-status-left-area-right-suffix
+set -gu @themepack-status-right-area-left-format
+set -gu @themepack-status-right-area-left-prefix
+set -gu @themepack-status-right-area-left-suffix
+set -gu @themepack-status-right-area-middle-format
+set -gu @themepack-status-right-area-middle-prefix
+set -gu @themepack-status-right-area-middle-suffix
+set -gu @themepack-status-right-area-right-format
+set -gu @themepack-status-right-area-right-prefix
+set -gu @themepack-status-right-area-right-suffix
+set -gu @themepack-window-status-current-format
+set -gu @themepack-window-status-current-prefix
+set -gu @themepack-window-status-current-suffix
+set -gu @themepack-window-status-format
+set -gu @themepack-window-status-prefix
+set -gu @themepack-window-status-suffix
+set -gu @theme-status-left-prefix
+set -gu @theme-status-left-suffix
+set -gu @theme-status-right-prefix
+set -gu @theme-status-right-suffix
+set -gu @theme-window-status-current-prefix
+set -gu @theme-window-status-current-suffix
+set -gu @theme-window-status-prefix
+set -gu @theme-window-status-suffix
+set -guF @paul-color-activity-1
+set -guF @paul-status-bg
+set -guF @paul-status-fg
+set -guF @paul-status-left-area-left-bg
+set -guF @paul-status-left-area-left-fg
+set -guF @paul-status-left-area-middle-bg
+set -guF @paul-status-left-area-middle-fg
+set -guF @paul-status-left-area-right-bg
+set -guF @paul-status-left-area-right-fg
+set -guF @paul-status-left-bg
+set -guF @paul-status-left-fg
+set -guF @paul-status-right-area-left-bg
+set -guF @paul-status-right-area-left-fg
+set -guF @paul-status-right-area-middle-bg
+set -guF @paul-status-right-area-middle-fg
+set -guF @paul-status-right-area-right-bg
+set -guF @paul-status-right-area-right-fg
+set -guF @paul-status-right-bg
+set -guF @paul-status-right-fg
+set -guF @powerline-color-activity-1
+set -guF @powerline-status-bg
+set -guF @powerline-status-fg
+set -guF @powerline-status-left-area-left-bg
+set -guF @powerline-status-left-area-left-fg
+set -guF @powerline-status-left-area-middle-bg
+set -guF @powerline-status-left-area-middle-fg
+set -guF @powerline-status-left-area-right-bg
+set -guF @powerline-status-left-area-right-fg
+set -guF @powerline-status-left-bg
+set -guF @powerline-status-left-fg
+set -guF @powerline-status-right-area-left-bg
+set -guF @powerline-status-right-area-left-fg
+set -guF @powerline-status-right-area-middle-bg
+set -guF @powerline-status-right-area-middle-fg
+set -guF @powerline-status-right-area-right-bg
+set -guF @powerline-status-right-area-right-fg
+set -guF @powerline-status-right-bg
+set -guF @powerline-status-right-fg
+set -guF @theme-clock-mode-colour
+set -guF @theme-display-panes-active-colour
+set -guF @theme-display-panes-colour
+set -guF @theme-message-bg
+set -guF @theme-message-command-bg
+set -guF @theme-message-command-fg
+set -guF @theme-message-fg
+set -guF @theme-mode-bg
+set -guF @theme-mode-fg
+set -guF @themepack-status-left-area-left-format
+set -guF @themepack-status-left-area-middle-format
+set -guF @themepack-status-left-area-right-format
+set -guF @themepack-status-right-area-left-format
+set -guF @themepack-status-right-area-middle-format
+set -guF @themepack-status-right-area-right-format
+set -guF @themepack-window-status-current-format
+set -guF @themepack-window-status-format
+set -guF @theme-pane-active-border-fg
+set -guF @theme-pane-border-fg
+set -guF @theme-status-bg
+set -guF @theme-status-fg
+set -guF @theme-status-left
+set -guF @theme-status-left-bg
+set -guF @theme-status-left-fg
+set -guF @theme-status-right
+set -guF @theme-status-right-bg
+set -guF @theme-status-right-fg
+set -guF @theme-window-status-activity-bg
+set -guF @theme-window-status-activity-fg
+set -guF @theme-window-status-current-bg
+set -guF @theme-window-status-current-fg
+set -guF @theme-window-status-current-format
+set -guF @theme-window-status-format
+set -gus @theme-pane-border-format
+set -guw pane-border-status
+set -gwuF clock-mode-colour
+set -gwuF clock-mode-style
+set -gwuF mode-style
+set -gwuF pane-active-border-style
+set -gwuF pane-border-style
+set -gwuF window-status-activity-style
+set -gwuF window-status-bell-style
+set -gwuF window-status-current-format
+set -gwuF window-status-current-style
+set -gwuF window-status-format
+set -gwuF window-status-separator
+set -gwuF window-style

Tools/UseTheme

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DEBUG=0
+
+get-tmux-option() {
+  local option value default
+  option="$1"
+  default="$2"
+  value="$(tmux show-option -gqv "$option")"
+
+  if ((DEBUG>0))
+  then
+    printf "option=%s default=%s value=%s\n" "$option" "$default" "$value" >&2
+  fi
+
+  if [ -n "$value" ]; then
+    echo "$value"
+  else
+    echo "$default"
+  fi
+}
+
+main() {
+  local theme
+  theme="$(get-tmux-option "@themepack" "basic")"
+
+  if [ -f "$CURRENT_DIR/${theme}.tmuxtheme" ]; then
+    tmux source-file "$CURRENT_DIR/${theme}.tmuxtheme"
+  else
+    tmux source-file "$CURRENT_DIR/powerline/${theme}.tmuxtheme"
+  fi
+}
+
+ErrMsg(){
+  printf "%b\n" "$@" >&2
+}
+
+################################################################################
+# Main #
+########
+while getopts ":dh" opt; do
+    case ${opt} in
+        d) DEBUG=1 ;;
+        h) Usage; exit 0; ;;
+        \?)
+            Usage;
+            ErrMsg "\nInvalid option: -${OPTARG}\n"
+            exit 1;
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+if ((DEBUG>0))
+then
+    ErrMsg "DEBUG: ${DEBUG}\n"
+fi
+
+main "$@"
+# vim: set ai et nu cin sts=2 sw=2 ts=2 tw=78 filetype=sh :