Merge branch 'master' of git.str8.biz:mj/zsh-config into 01-pull

mj
2 parents 309611fbb2 6303a51727
Showing 4 changed files Side-by-side Diff
templates/bashrc.sh
templates/zshrc.sh
tools/install.sh
tools/sys_base_install.sh
@@ -45,13 +45,13 @@ export HISTFILESIZE=
 export HISTSIZE=
 export HISTTIMEFORMAT="[%F %T] "
 # Change the file location
-export HISTFILE=~/.new_bash_history
+export HISTFILE=~/.config/new_bash_history
 # Force prompt to write history after every command
 PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
  
  
 # check the window size after each command
-shopt -s checkwinsize
+shopt -s checkwinsize~/.bash_aliases
  
 # If set, the pattern "**" used in a pathname expansion context will
 # match all files and zero or more directories and subdirectories.
@@ -103,6 +103,6 @@ fi
  
 # Alias definitions
  
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
+if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
+    . ~/.config/zsh-config/templates/bash_aliases
 fi
@@ -4,12 +4,14 @@ export GJ_DEVENV=local_aptproxy
  
 export ZCFG=~/.config/zsh-config
 # Path to your oh-my-zsh installation.
-export ZSH=$ZCFG/tools/oh-my-zsh
+export ZSH=$ZCFG/packages/oh-my-zsh
  
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-# time that oh-my-zsh is loaded.
+export LANG=en_US.UTF-8
+
+# Compilation flags
+export ARCHFLAGS="-arch x86_64"
+
+# Themes are in (...)/oh-my-zsh/themes/ or "random"
 ZSH_THEME="muse"
  
 CASE_SENSITIVE="true"
@@ -26,16 +28,21 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
 		meteor node npm
 )
  
+#if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
+#    . ~/.config/zsh-config/templates/bash_aliases
+#fi
+
 # User configuration
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
  
-source $ZSH/oh-my-zsh.sh
-export LANG=en_US.UTF-8
+source ~/.zshrc
+
+# source $ZSH/oh-my-zsh.sh
  
 # ANTIGEN:
 #
-# source $ZCFG/tools/antigen/antigen.zsh
+# source $ZCFG/packages/antigen/antigen.zsh
 #
 # MUST:
 #antigen bundle extract
@@ -76,11 +83,4 @@ export LANG=en_US.UTF-8
 #   export EDITOR='vim'
 # else
 #   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-export ARCHFLAGS="-arch x86_64"
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
+# fi
 \ No newline at end of file
 #@IgnoreInspection AddShebang
-# ** Initiate with: **
-# cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh -O -| sh
-# -----------------------------------------------------------------------------------
+#
+#	** Initiate with: **
+#	cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh | sh
+#
+# ---------------------------------------------------------------------------------------------
+#
+#	gj@ubuntu4docker:~$ touch install.sh
+#	gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh
+#
+################################################################################################
  
 set -e
  
@@ -11,17 +18,18 @@ if [ &quot;$SHELL&quot; != &quot;$(which zsh)&quot; ]; then
  
 	echo "ok"
  
-	sudo apt-get -yq install curl dialog nano python-setuptools zsh
+	sudo apt-get -yq install curl dialog git nano zsh
+	#sudo apt-get -yq python-setuptools
  
-	sudo easy_install pip
-	sudo pip install virtualenvwrapper
+	#sudo easy_install pip
+	#sudo pip install virtualenvwrapper
 fi
  
-if [ 1 == 1 ]; then
+if [ 1 == 2 ]; then
 	mkvirtualenv cb-meteor
 	pip install nodeenv
 	nodeenv -p
-	curl https://install.meteor.com/ | sh
+	# curl https://install.meteor.com/ | sh
 fi
  
 if [ ! -n "$ZCNF" ]; then
@@ -29,7 +37,7 @@ if [ ! -n &quot;$ZCNF&quot; ]; then
 fi
  
 if [ ! -n "$ZSH" ]; then
-  ZSH=$ZCNF/tools/oh-my-zsh
+  ZSH=$ZCNF/packages/oh-my-zsh
 fi
  
 echo "\033[0;34mCleaning...\033[0m"
@@ -65,9 +73,9 @@ hash git &gt;/dev/null 2&gt;&amp;1 &amp;&amp; env git clone --depth=1 http://git.str8.biz/mj/zsh-c
 }
  
 echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
-ln -s $ZCNF/templates/zshrc.sh ~/.zshrc
-ln -s $ZCNF/templates/bashrc.sh ~/.bashrc
-ln -s $ZCNF/templates/bash_aliases.sh ~/.bash_aliases
+cp $ZCNF/templates/zshrc.sh ~/.zshrc
+cp $ZCNF/templates/bashrc.sh ~/.bashrc
+  # ln -s $ZCNF/templates/bash_aliases.sh ~/.bash_aliases
 sed -i -e "/^export ZSH=/ c\\
 export ZSH=$ZSH
 " ~/.zshrc
@@ -79,7 +87,8 @@ export PATH=\&quot;$PATH\&quot;
  
 if [ "$SHELL" != "$(which zsh)" ]; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
-    echo "chsh -s $(which zsh)"
+    # echo "chsh -s $(which zsh)"
+    echo "chsh -s /bin/zsh"
 fi
  
 echo "\033[0;32m"'         __                                     __   '"\033[0m"
@@ -4,12 +4,14 @@
 # cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/sys_base_install.sh -O | sh
 # -------------------------------------------------------------------------------------------
  
-# ** Helper Functions **
-# ----------------------
+set -e
  
 export GJ_DEVENV="local_aptproxy"
 export GJ_SHELL="bash"
  
+# ** Helper Functions **
+# ----------------------
+
 function set_apt_proxy {
 	if [[ "$GJ_DEVENV" == "local_aptproxy" ]]; then
 		echo "Setting apt-proxy: srvths"
@@ -37,7 +39,7 @@ if [ ! -n &quot;$ZCNF&quot; ]; then
 fi
  
 if [ ! -n "$ZSH" ]; then
-  ZSH=$ZCNF/tools/oh-my-zsh
+  ZSH=$ZCNF/packages/oh-my-zsh
 fi
  
 #export DEBIAN_FRONTEND=noninteractive
...	...	@@ -45,13 +45,13 @@ export HISTFILESIZE=
45	45	export HISTSIZE=
46	46	export HISTTIMEFORMAT="[%F %T] "
47	47	# Change the file location
48		-export HISTFILE=~/.new_bash_history
	48	+export HISTFILE=~/.config/new_bash_history
49	49	# Force prompt to write history after every command
50	50	PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
51	51
52	52
53	53	# check the window size after each command
54		-shopt -s checkwinsize
	54	+shopt -s checkwinsize~/.bash_aliases
55	55
56	56	# If set, the pattern "**" used in a pathname expansion context will
57	57	# match all files and zero or more directories and subdirectories.
...	...	@@ -103,6 +103,6 @@ fi
103	103
104	104	# Alias definitions
105	105
106		-if [ -f ~/.bash_aliases ]; then
107		- . ~/.bash_aliases
	106	+if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
	107	+ . ~/.config/zsh-config/templates/bash_aliases
108	108	fi
...	...	@@ -4,12 +4,14 @@ export GJ_DEVENV=local_aptproxy
4	4
5	5	export ZCFG=~/.config/zsh-config
6	6	# Path to your oh-my-zsh installation.
7		-export ZSH=$ZCFG/tools/oh-my-zsh
	7	+export ZSH=$ZCFG/packages/oh-my-zsh
8	8
9		-# Set name of the theme to load.
10		-# Look in ~/.oh-my-zsh/themes/
11		-# Optionally, if you set this to "random", it'll load a random theme each
12		-# time that oh-my-zsh is loaded.
	9	+export LANG=en_US.UTF-8
	10	+
	11	+# Compilation flags
	12	+export ARCHFLAGS="-arch x86_64"
	13	+
	14	+# Themes are in (...)/oh-my-zsh/themes/ or "random"
13	15	ZSH_THEME="muse"
14	16
15	17	CASE_SENSITIVE="true"
...	...	@@ -26,16 +28,21 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
26	28	meteor node npm
27	29	)
28	30
	31	+#if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
	32	+# . ~/.config/zsh-config/templates/bash_aliases
	33	+#fi
	34	+
29	35	# User configuration
30	36	export PATH=$HOME/bin:/usr/local/bin:$PATH
31	37	# export MANPATH="/usr/local/man:$MANPATH"
32	38
33		-source $ZSH/oh-my-zsh.sh
34		-export LANG=en_US.UTF-8
	39	+source ~/.zshrc
	40	+
	41	+# source $ZSH/oh-my-zsh.sh
35	42
36	43	# ANTIGEN:
37	44	#
38		-# source $ZCFG/tools/antigen/antigen.zsh
	45	+# source $ZCFG/packages/antigen/antigen.zsh
39	46	#
40	47	# MUST:
41	48	#antigen bundle extract
...	...	@@ -76,11 +83,4 @@ export LANG=en_US.UTF-8
76	83	# export EDITOR='vim'
77	84	# else
78	85	# export EDITOR='mvim'
79		-# fi
80		-
81		-# Compilation flags
82		-export ARCHFLAGS="-arch x86_64"
83		-
84		-if [ -f ~/.bash_aliases ]; then
85		- . ~/.bash_aliases
86		-fi
	86	+# fi
87	87	\ No newline at end of file
1	1	#@IgnoreInspection AddShebang
2		-# Initiate with:
3		-# cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh -O -\| sh
4		-# -----------------------------------------------------------------------------------
	2	+#
	3	+# Initiate with:
	4	+# cd && curl -L http://git.str8.biz/mj/zsh-config/raw/master/tools/install.sh \| sh
	5	+#
	6	+# ---------------------------------------------------------------------------------------------
	7	+#
	8	+# gj@ubuntu4docker:~$ touch install.sh
	9	+# gj@ubuntu4docker:~$ rm install.sh && nano install.sh && chmod +x install.sh && ./install.sh
	10	+#
	11	+################################################################################################
5	12
6	13	set -e
7	14
...	...	@@ -11,17 +18,18 @@ if [ "$SHELL" != "$(which zsh)" ]; then
11	18
12	19	echo "ok"
13	20
14		- sudo apt-get -yq install curl dialog nano python-setuptools zsh
	21	+ sudo apt-get -yq install curl dialog git nano zsh
	22	+ #sudo apt-get -yq python-setuptools
15	23
16		- sudo easy_install pip
17		- sudo pip install virtualenvwrapper
	24	+ #sudo easy_install pip
	25	+ #sudo pip install virtualenvwrapper
18	26	fi
19	27
20		-if [ 1 == 1 ]; then
	28	+if [ 1 == 2 ]; then
21	29	mkvirtualenv cb-meteor
22	30	pip install nodeenv
23	31	nodeenv -p
24		- curl https://install.meteor.com/ \| sh
	32	+ # curl https://install.meteor.com/ \| sh
25	33	fi
26	34
27	35	if [ ! -n "$ZCNF" ]; then
...	...	@@ -29,7 +37,7 @@ if [ ! -n "$ZCNF" ]; then
29	37	fi
30	38
31	39	if [ ! -n "$ZSH" ]; then
32		- ZSH=$ZCNF/tools/oh-my-zsh
	40	+ ZSH=$ZCNF/packages/oh-my-zsh
33	41	fi
34	42
35	43	echo "\033[0;34mCleaning...\033[0m"
...	...	@@ -65,9 +73,9 @@ hash git >/dev/null 2>&1 && env git clone --depth=1 http://git.str8.biz/mj/zsh-c
65	73	}
66	74
67	75	echo "\033[0;34mUsing the Zsh Config template file and adding it to ~/.zshrc\033[0m"
68		-ln -s $ZCNF/templates/zshrc.sh ~/.zshrc
69		-ln -s $ZCNF/templates/bashrc.sh ~/.bashrc
70		-ln -s $ZCNF/templates/bash_aliases.sh ~/.bash_aliases
	76	+cp $ZCNF/templates/zshrc.sh ~/.zshrc
	77	+cp $ZCNF/templates/bashrc.sh ~/.bashrc
	78	+ # ln -s $ZCNF/templates/bash_aliases.sh ~/.bash_aliases
71	79	sed -i -e "/^export ZSH=/ c\\
72	80	export ZSH=$ZSH
73	81	" ~/.zshrc
...	...	@@ -79,7 +87,8 @@ export PATH=\"$PATH\"
79	87
80	88	if [ "$SHELL" != "$(which zsh)" ]; then
81	89	echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
82		- echo "chsh -s $(which zsh)"
	90	+ # echo "chsh -s $(which zsh)"
	91	+ echo "chsh -s /bin/zsh"
83	92	fi
84	93
85	94	echo "\033[0;32m"' __ __ '"\033[0m"
...	...	@@ -4,12 +4,14 @@
4	4	# cd && wget http://git.str8.biz/mj/zsh-config/raw/master/tools/sys_base_install.sh -O \| sh
5	5	# -------------------------------------------------------------------------------------------
6	6
7		-# Helper Functions
8		-# ----------------------
	7	+set -e
9	8
10	9	export GJ_DEVENV="local_aptproxy"
11	10	export GJ_SHELL="bash"
12	11
	12	+# Helper Functions
	13	+# ----------------------
	14	+
13	15	function set_apt_proxy {
14	16	if [[ "$GJ_DEVENV" == "local_aptproxy" ]]; then
15	17	echo "Setting apt-proxy: srvths"
...	...	@@ -37,7 +39,7 @@ if [ ! -n "$ZCNF" ]; then
37	39	fi
38	40
39	41	if [ ! -n "$ZSH" ]; then
40		- ZSH=$ZCNF/tools/oh-my-zsh
	42	+ ZSH=$ZCNF/packages/oh-my-zsh
41	43	fi
42	44
43	45	#export DEBIAN_FRONTEND=noninteractive