Skip to content

Commit

Permalink
Bug fixes. Added removeXcodeDerivedData.
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McNally committed Jun 17, 2016
1 parent 65786f8 commit 11c1fe3
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 25 deletions.
2 changes: 1 addition & 1 deletion addAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="add"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
4 changes: 2 additions & 2 deletions branchDelete
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ branch=$1

`dirname $0`/utils/gitHeader

git push origin --delete ${branch} || true
git branch -d ${branch} || true
git push origin --delete "${branch} "|| true
git branch -d "${branch}" || true
2 changes: 1 addition & 1 deletion branchDeleteAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ branch=$1

script="branchDelete"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script} ${branch}
"${dir}/utils/scriptTopLast" "${dir}/${script} ${branch}"
2 changes: 1 addition & 1 deletion branchListAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="branchList"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
2 changes: 1 addition & 1 deletion branchNewAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ branch=$1

script="branchNew"
dir=`dirname $0`
${dir}/utils/scriptTopFirst ${dir}/${script} ${branch}
"${dir}/utils/scriptTopFirst" "${dir}/${script}" "${branch}"
2 changes: 1 addition & 1 deletion checkout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ commit=$1

`dirname $0`/utils/gitHeader

git checkout ${commit}
git checkout "${commit}"
2 changes: 1 addition & 1 deletion checkoutAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ commit=$1

script="checkout"
dir=`dirname $0`
${dir}/utils/scriptTopFirst ${dir}/${script} ${commit}
"${dir}/utils/scriptTopFirst" "${dir}/${script}" "${commit}"
3 changes: 2 additions & 1 deletion commit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ then
fi

comment=$1
echo "commit comment: ${comment}"

`dirname $0`/utils/gitHeader
git commit -m '${comment}' || true
git commit -m "${comment}" || true
3 changes: 2 additions & 1 deletion commitAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ then
fi

comment=$1
echo "comment: ${comment}"

script="commit"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script} ${comment}
"${dir}/utils/scriptTopLast" "${dir}/${script}" "${comment}"
2 changes: 1 addition & 1 deletion conflictsListAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="conflictsList"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
2 changes: 1 addition & 1 deletion fetchAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="fetch"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
2 changes: 1 addition & 1 deletion merge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ commit=$1

`dirname $0`/utils/gitHeader

git merge --no-edit --verbose origin/${commit}
git merge --no-edit --verbose "origin/${commit}" || true
2 changes: 1 addition & 1 deletion mergeAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ commit=$1

script="merge"
dir=`dirname $0`
${dir}/utils/scriptTopFirst ${dir}/${script} ${commit}
"${dir}/utils/scriptTopFirst" "${dir}/${script}" "${commit}"
2 changes: 1 addition & 1 deletion pullAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="pull"
dir=`dirname $0`
${dir}/utils/scriptTopFirst ${dir}/${script}
"${dir}/utils/scriptTopFirst" "${dir}/${script}"
2 changes: 1 addition & 1 deletion pushAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="push"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
3 changes: 3 additions & 0 deletions removeXcodeDerivedData
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

rm -rf ~/Library/Developer/Xcode/DerivedData
4 changes: 2 additions & 2 deletions resetHard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ commit=$1

`dirname $0`/utils/gitHeader

git checkout ${commit}
git reset --hard origin/${commit}
git checkout "${commit}"
git reset --hard "origin/${commit}"
2 changes: 1 addition & 1 deletion resetHardAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ commit=$1

script="resetHard"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script} ${commit}
"${dir}/utils/scriptTopLast" "${dir}/${script}" "${commit}"
2 changes: 1 addition & 1 deletion statusAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="status"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
2 changes: 1 addition & 1 deletion untrackedListAll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script="untrackedList"
dir=`dirname $0`
${dir}/utils/scriptTopLast ${dir}/${script}
"${dir}/utils/scriptTopLast" "${dir}/${script}"
4 changes: 2 additions & 2 deletions utils/scriptTopFirst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -e

script=$1
arg=$2
${script} ${arg}
git submodule --quiet foreach --recursive ${script} ${arg}
"${script}" "${arg}"
git submodule --quiet foreach --recursive "${script}" "${arg}"
echo
4 changes: 2 additions & 2 deletions utils/scriptTopLast
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -e

script=$1
arg=$2
git submodule --quiet foreach --recursive ${script} ${arg}
${script} ${arg}
git submodule --quiet foreach --recursive "${script}" "${arg}"
"${script}" "${arg}"
echo

0 comments on commit 11c1fe3

Please sign in to comment.