Skip to content

Commit

Permalink
Small tweaks here and there
Browse files Browse the repository at this point in the history
  • Loading branch information
adamyonk committed Nov 21, 2016
1 parent 35d585a commit 129cb37
Show file tree
Hide file tree
Showing 11 changed files with 294 additions and 88 deletions.
17 changes: 15 additions & 2 deletions bash/bashrc.symlink
Expand Up @@ -90,6 +90,10 @@ alias p='production'
# Homebrew
export HOMEBREW_CASK_OPTS="--appdir=/Applications"

# Java
export PATH="$HOME/.jenv/bin:$PATH"
if which jenv > /dev/null; then eval "$(jenv init -)"; fi

# NVM
export NVM_DIR="/Users/adamyonk/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
Expand Down Expand Up @@ -136,8 +140,17 @@ alias sound='afplay /System/Library/Sounds/Glass.aiff'
alias ssh_up='systemsetup -setremotelogin on'
alias ssh_down='systemsetup -setremotelogin off'

alias start_services='brew services start cassandra mysql postgresql redis zookeeper'
alias stop_services='brew services stop cassandra mysql postgresql redis zookeeper'
services='cassandra memcached mysql postgresql redis zookeeper'
function start_services() {
for service in services ; do
brew services start "$service"
done
}
function stop_services() {
for service in services ; do
brew services stop "$service"
done
}

# Tmux
alias tmux='tmux -2'
Expand Down
Binary file removed bin/asciinema
Binary file not shown.
2 changes: 1 addition & 1 deletion bin/battery
Expand Up @@ -5,4 +5,4 @@ OUTPUT=$(pmset -g batt | grep Internal)
# Now drawing from 'Battery Power'
# -InternalBattery-0 55%; discharging; 3:41 remaining present: true

echo $OUTPUT | awk '{print $2}' | sed 's/;//'
echo $OUTPUT | awk '{print $3}' | sed 's/;//'
10 changes: 8 additions & 2 deletions bin/git-deploy
Expand Up @@ -10,7 +10,7 @@ fi

echo -e "\n > hub ci-status"
if [ "$(hub ci-status)" != 'success' ]; then
read -n 1 -p "CI Failure. Override?" response
read -n 1 -p "CI Failure. Override? " response
if [ "$response" != 'y' ]; then
exit 1
fi
Expand All @@ -32,7 +32,7 @@ fi

echo -e "\n > git push origin :$branch"
git push origin :"$branch"
if [ $/ != 0 ]; then
if [ $? != 0 ]; then
echo "Could not delete remote branch $branch"
fi

Expand All @@ -43,6 +43,12 @@ if [ $? != 0 ]; then
exit 1
fi

echo -e "\n > git branch -d $branch"
git branch -d "$branch"
if [ $? != 0 ]; then
echo "Could not delete local branch $branch"
fi

echo -e "\n > git new-tag"
git new-tag
if [ $? != 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/git-lita-ship
Expand Up @@ -10,7 +10,7 @@ else
COMMAND="lita ship $BRANCH to $(basename $(pwd)) staging"
fi
echo -n "$COMMAND" | pbcopy
echo "\"$COMMAND\" copied to clipboard."
echo -e "\n\"$COMMAND\" copied to clipboard."

status="$(hub ci-status)"
if [ "$status" != 'success' ]; then
Expand Down
9 changes: 9 additions & 0 deletions bin/push
@@ -0,0 +1,9 @@
#!/usr/bin/env sh

input="${1:-$(cat)}"

curl -s \
--form-string "token=$PUSHOVER_API_TOKEN" \
--form-string "user=$PUSHOVER_API_USER" \
--form-string "message=$input" \
https://api.pushover.net/1/messages.json
24 changes: 24 additions & 0 deletions system/config.symlink/browser-launcher/config.json
@@ -0,0 +1,24 @@
{
"browsers": {
"local": [
{
"command": "/Applications/Firefox.app/Contents/MacOS/firefox-bin",
"version": "39.0",
"name": "firefox",
"re": {},
"type": "firefox",
"profile": {
"name": "browser-launcher-46a1a1771d5bc",
"file": "/Users/adamyonk/Library/Application Support/Firefox/Profiles/3s5zlkkb.browser-launcher-46a1a1771d5bc/prefs.js"
}
},
{
"command": "/Applications/Safari.app",
"version": "10.0.1",
"name": "safari",
"type": "safari",
"profile": false
}
]
}
}
4 changes: 4 additions & 0 deletions system/config.symlink/heroku/config.json
@@ -0,0 +1,4 @@
{
"skip_analytics": false,
"color": true
}

0 comments on commit 129cb37

Please sign in to comment.