Merge branch 'master' of github.com:revans/bash-it
diff --git a/.gitignore b/.gitignore
index bcddac3..fec6fae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
.rvmrc
aliases/custom.aliases.bash
lib/custom.bash
-plugins/custom.plugins.bash
\ No newline at end of file
+plugins/custom.plugins.bash
+*.swp
diff --git a/aliases/general.aliases.bash b/aliases/general.aliases.bash
index 1d43d45..ebec1bd 100644
--- a/aliases/general.aliases.bash
+++ b/aliases/general.aliases.bash
@@ -6,6 +6,7 @@
alias la='ls -AF' # Compact view, show hidden
alias ll='ls -al'
alias l='ls -a'
+alias l1='ls -1'
alias c='clear'
alias k='clear'
diff --git a/aliases/git.aliases.bash b/aliases/git.aliases.bash
index 476ef08..40d8780 100644
--- a/aliases/git.aliases.bash
+++ b/aliases/git.aliases.bash
@@ -8,6 +8,7 @@
alias get='git'
alias gst='git status'
alias gs='git status'
+alias gss='git status -s'
alias gl='git pull'
alias gup='git fetch && git rebase'
alias gp='git push'
@@ -46,6 +47,7 @@
echo " ga = git add"
echo " gall = git add ."
echo " gst/gs = git status"
+ echo " gss = git status -s"
echo " gl = git pull"
echo " gup = git fetch && git rebase"
echo " gp = git push"
diff --git a/aliases/jekyll.aliases.bash b/aliases/jekyll.aliases.bash
new file mode 100644
index 0000000..a3e3fc0
--- /dev/null
+++ b/aliases/jekyll.aliases.bash
@@ -0,0 +1,19 @@
+# Open the root of your site in your favorite editor
+
+alias newentry="cd $JEKYLL_LOCAL_ROOT && $EDITOR ."
+
+# Open the _posts/ directory for making a new blog post (seperate from above alias because not everyone uses jekyll for a blog)
+
+alias newpost="cd $JEKYLL_LOCAL_ROOT/_posts && $EDITOR ."
+
+# Build and locally serve the site
+
+alias testsite="cd $JEKYLL_LOCAL_ROOT && jekyll --server --auto"
+
+# Build but don't locally serve the site
+
+alias buildsite="cd $JEKYLL_LOCAL_ROOT && rm -rf _site/ && jekyll"
+
+# Rsync the site to the remote server
+
+alias deploysite="cd $JEKYLL_LOCAL_ROOT && rsync -rz _site/ $JEKYLL_REMOTE_ROOT"
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index f6c9d5d..f46d71d 100644
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -17,7 +17,7 @@
export GIT_HOSTING='git@git.domain.com'
# Set my editor and git editor
-export EDITOR="/usr/bin/mate -w"
+export EDITOR="/usr/bin/mate -w"
export GIT_EDITOR='/usr/bin/mate -w'
# Set the path nginx
@@ -26,5 +26,13 @@
# Don't check mail when opening terminal.
unset MAILCHECK
+# Change this to the path of your local jekyll root to use the jekyll aliases
+
+export JEKYLL_LOCAL_ROOT="~/Sites/mrminimalist"
+
+# And change this to the remote server and root
+
+export JEKYLL_REMOTE_ROOT="user@server:/path/to/jekyll/root"
+
# Load Bash It
source $BASH/bash_it.sh