WIP move away from '.'

Author: weikinhuang

.dotenv/cygwin/bin/apt-cyg

@@ -1,18 +0,0 @@
-# ignore everything
-*
-# except:
-!.bash_profile
-!.bashrc
-!.dotenv
-!.dotenv/*
-!.git
-!.gitconfig
-!.gitignore
-!.hushlogin
-!.inputrc
-!.mongorc.js
-!.screenrc
-!.wgetrc
-!bootstrap.sh
-!install.sh
-!README.md

.gitignore

@@ -56,8 +56,8 @@ fi
 
 # Source ~/.exports, ~/.functions, ~/.aliases, ~/.completion, ~/.extra, ~/.env if they exist
 for file in {exports,functions,aliases,completion,extra,env}; do
-	[[ -r "${HOME}/.dotenv/.${file}" ]] && source "${HOME}/.dotenv/.${file}"
-	[[ -r "${HOME}/.dotenv/${DOTENV}/.${file}" ]] && source "${HOME}/.dotenv/${DOTENV}/.${file}"
+	[[ -r "${HOME}/.dotenv/${file}" ]] && source "${HOME}/.dotenv/${file}"
+	[[ -r "${HOME}/.dotenv/${DOTENV}/${file}" ]] && source "${HOME}/.dotenv/${DOTENV}/${file}"
 done
 unset file
 
@@ -66,13 +66,13 @@ unset file
 
 # Source ~/.post-local, ~/.prompt if they exist
 for file in {post-local,prompt}; do
-	[[ -r "${HOME}/.dotenv/.${file}" ]] && source "${HOME}/.dotenv/.${file}"
-	[[ -r "${HOME}/.dotenv/${DOTENV}/.${file}" ]] && source "${HOME}/.dotenv/${DOTENV}/.${file}"
+	[[ -r "${HOME}/.dotenv/${file}" ]] && source "${HOME}/.dotenv/${file}"
+	[[ -r "${HOME}/.dotenv/${DOTENV}/${file}" ]] && source "${HOME}/.dotenv/${DOTENV}/${file}"
 done
 unset file
 
 # include utility settings file (git PS1, solarized, mysql, etc...)
-[[ -r "${HOME}/.dotenv/.utility" ]] && source "${HOME}/.dotenv/.utility"
+[[ -r "${HOME}/.dotenv/utility" ]] && source "${HOME}/.dotenv/utility"
 
 # set $EDITOR to vi(m) if not already set
 [[ -z $EDITOR ]] && EDITOR=$(type vim &> /dev/null && echo vim || echo vi)
@@ -106,4 +106,4 @@ shopt -s checkjobs 2> /dev/null
 [[ "$(pwd)" == "${HOME}" ]] && [[ -n "${START_DIR}" ]] && [[ -e "${START_DIR}" ]] && cd "${START_DIR}"
 
 # exit with a success status code
-return 0
+return 0

README.md

@@ -38,15 +38,16 @@ fi
 # link up files
 function link_file () {
 	file="$1"
+	target="$2"
 	# remove the backup first
-	[[ -e "$INSTALL_ROOT/$file.bak" ]] && rm -f "$INSTALL_ROOT/$file.bak"
+	[[ -e "$INSTALL_ROOT/$target.bak" ]] && rm -f "$INSTALL_ROOT/$target.bak"
 	# create the backup file
-	[[ -e "$INSTALL_ROOT/$file" ]] && mv "$INSTALL_ROOT/$file" "$INSTALL_ROOT/$file.bak"
+	[[ -e "$INSTALL_ROOT/$target" ]] && mv "$INSTALL_ROOT/$target" "$INSTALL_ROOT/$target.bak"
 	# link up the file
 	if [[ -e "$DOTFILES_ROOT/$file" ]]; then
-		echo "linking up '$DOTFILES_ROOT/$file' => '$INSTALL_ROOT/$file'"
-		if ! ln -sf "$DOTFILES_ROOT/$file" "$INSTALL_ROOT/$file"; then
-			echo "Unable to symlink '$INSTALL_ROOT/$file'"
+		echo "linking up '$DOTFILES_ROOT/$file' => '$INSTALL_ROOT/$target'"
+		if ! ln -sf "$DOTFILES_ROOT/$file" "$INSTALL_ROOT/$target"; then
+			echo "Unable to symlink '$INSTALL_ROOT/$target'"
 		fi
 	fi
 }
@@ -116,7 +117,7 @@ fi
 
 # symlink all the files
 for file in $LINKED_FILES; do
-	link_file ".$file"
+	link_file "$file" ".$file"
 done
 
 # done

.bash_profile bash_profile

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cmd /C start 'C:\cygwin\cygsetup.cmd'

.bashrc bashrc

@@ -6,4 +6,4 @@ fi
 
 ACK_VERSION_FULL="$(curl -s https://api.github.com/repos/petdance/ack2/tags | grep '"name": "' | grep -v "RC\|beta\|alpha" | sort -r --version-sort | head -n 1 | sed 's/.*"name": "\([0123456789._]\+\)",.*/\1/')"
 
-curl "http://beyondgrep.com/ack-${ACK_VERSION_FULL}-single-file" > ~/bin/ack && chmod 0755 !#:3
+curl "http://beyondgrep.com/ack-${ACK_VERSION_FULL}-single-file" > ~/bin/ack && chmod 0755 ~/bin/ack

bootstrap.sh

@@ -57,6 +57,9 @@ fi
 
 "/c/Program Files/nodejs/npm.cmd" install -g npm@latest
 
+# fix path for npm command
+PATH="/c/Program Files/nodejs:$PATH"
+
 if [[ -e "/c/Users/$USER/AppData/Roaming/npm/npm.cmd" ]]; then
 	LOCAL_NPM_CMD="/c/Users/$USER/AppData/Roaming/npm/npm.cmd"
 else

.dotenv/.gitignore dotenv/.gitignore

@@ -6,4 +6,4 @@ fi
 
 YT_DL_VERSION_FULL="$(curl -s https://api.github.com/repos/rg3/youtube-dl/tags | grep '"name": "' | grep -v "RC\|beta\|alpha" | sort -r --version-sort | head -n 1 | sed 's/.*"name": "\([0123456789._]\+\)",.*/\1/')"
 
-curl "https://yt-dl.org/downloads/${YT_DL_VERSION_FULL}/youtube-dl" > ~/bin/youtube-dl && chmod 0755 !#:3
+curl "https://yt-dl.org/downloads/${YT_DL_VERSION_FULL}/youtube-dl" > ~/bin/youtube-dl && chmod 0755 ~/bin/youtube-dl

.dotenv/.aliases dotenv/aliases

@@ -1,6 +1,6 @@
 " Source the dotfiles vimrc file
 if filereadable(expand('~/.vim/.vimrc'))
-	source ~/.vim/.vimrc
+	source ~/.vim/vimrc
 endif
 
 " source any local vimrc files