From c92a5f23f3161f84bc44fd27240634fc47c81437 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Sat, 23 Oct 2010 10:57:31 -0500 Subject: [PATCH 1/6] Added jekyll aliases --- aliases/jekyll.aliases.bash | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 aliases/jekyll.aliases.bash diff --git a/aliases/jekyll.aliases.bash b/aliases/jekyll.aliases.bash new file mode 100644 index 00000000..249bca16 --- /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" From 96ccdaee51e9b40fc4427f1fc14a9cfe4b4e871a Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Sat, 23 Oct 2010 10:58:44 -0500 Subject: [PATCH 2/6] Added some variables that the jekyll aliases need --- template/bash_profile.template.bash | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash index f6c9d5d4..f46d71db 100644 --- a/template/bash_profile.template.bash +++ b/template/bash_profile.template.bash @@ -17,7 +17,7 @@ export BASH_THEME='bobby' 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 @@ export NGINX_PATH='/opt/nginx' # 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 From 21820276fb8546d63828e05370b6545f2b24fa07 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Sat, 23 Oct 2010 11:10:37 -0500 Subject: [PATCH 3/6] Fixed a stupid mistake in using percent signs instead of ampersands --- aliases/jekyll.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/jekyll.aliases.bash b/aliases/jekyll.aliases.bash index 249bca16..a3e3fc05 100644 --- a/aliases/jekyll.aliases.bash +++ b/aliases/jekyll.aliases.bash @@ -16,4 +16,4 @@ 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" +alias deploysite="cd $JEKYLL_LOCAL_ROOT && rsync -rz _site/ $JEKYLL_REMOTE_ROOT" From 5ec52df28a068cc958f91f927f2a9e81f281eac4 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Sun, 24 Oct 2010 08:57:01 -0500 Subject: [PATCH 4/6] Added git alias: gss=git status -s --- aliases/git.aliases.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aliases/git.aliases.bash b/aliases/git.aliases.bash index 476ef086..40d87802 100644 --- a/aliases/git.aliases.bash +++ b/aliases/git.aliases.bash @@ -8,6 +8,7 @@ alias g='git' 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 @@ function git-help() { 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" From a308e771e5471286599b4402a60b469b0e8950d9 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Mon, 25 Oct 2010 08:44:47 -0500 Subject: [PATCH 5/6] Added l1 alias for ls -1 --- aliases/general.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/general.aliases.bash b/aliases/general.aliases.bash index 1d43d451..ebec1bda 100644 --- a/aliases/general.aliases.bash +++ b/aliases/general.aliases.bash @@ -6,6 +6,7 @@ alias ls='ls -G' # Compact view, show colors 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' From af2d6bb7a9a96e92f623247f8349e3b85cffa403 Mon Sep 17 00:00:00 2001 From: Mark Szymanski Date: Mon, 25 Oct 2010 08:45:52 -0500 Subject: [PATCH 6/6] Added ignore directive for vim swap files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bcddac3f..fec6fae1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ custom/*.bash .rvmrc aliases/custom.aliases.bash lib/custom.bash -plugins/custom.plugins.bash \ No newline at end of file +plugins/custom.plugins.bash +*.swp