Skip to content

Commit

Permalink
Consistently use dashes in utils function names
Browse files Browse the repository at this point in the history
  • Loading branch information
Thierry Lacour authored and RandomSort committed May 25, 2020
1 parent 076218c commit eeb834c
Show file tree
Hide file tree
Showing 31 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion 3-way-merge/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="3-way-merge"
makerepo
make-exercise-repo

touch greeting.txt
git add greeting.txt
Expand Down
2 changes: 1 addition & 1 deletion advanced-rebase-interactive/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

git commit --allow-empty -m "Initial commit"

Expand Down
2 changes: 1 addition & 1 deletion amend/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source ../utils/utils.sh

makerepo
make-exercise-repo
echo "foo" > foo.txt

echo "bar" > bar.txt
Expand Down
2 changes: 1 addition & 1 deletion bad-commit/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source ../utils/utils.sh

kata="kata4-bad-commit"

makerepo
make-exercise-repo

touch file1
git add file1
Expand Down
2 changes: 1 addition & 1 deletion basic-cleaning/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source ../utils/utils.sh

kata="basic-cleaning"

makerepo
make-exercise-repo
mkdir src

echo "** SOME USEFUL INFO ** " > README.txt
Expand Down
2 changes: 1 addition & 1 deletion basic-commits/setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
kata="basic-commits-master"
source ../utils/utils.sh
makerepo
make-exercise-repo
2 changes: 1 addition & 1 deletion bisect/setup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
source ../utils/utils.sh

makerepo
make-exercise-repo

echo '#! /usr/bin/env bash' > 'test.sh'
echo 'if [[ $(( $(find * | wc -l) + 10 )) -gt 32 ]] ;then' >> 'test.sh'
Expand Down
2 changes: 1 addition & 1 deletion commit-on-wrong-branch-2/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

echo "Some coode" > myapp.txt
echo "Some other line of code" >> myapp.txt
Expand Down
2 changes: 1 addition & 1 deletion commit-on-wrong-branch/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source ../utils/utils.sh

kata="kata5-commit-on-wrong-branch"

makerepo
make-exercise-repo

touch file.txt

Expand Down
2 changes: 1 addition & 1 deletion detached-head/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="kata3-detached-head"
makerepo
make-exercise-repo


touch file1
Expand Down
2 changes: 1 addition & 1 deletion ff-merge/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="ff-merge"
makerepo
make-exercise-repo

touch greeting.txt
git add greeting.txt
Expand Down
2 changes: 1 addition & 1 deletion git-attributes/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="git-attributes"
makerepo
make-exercise-repo

printf 'hello æøå\r\n' > file1.txt
git init
Expand Down
2 changes: 1 addition & 1 deletion git-tag/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="$(basename $(pwd))"
makerepo
make-exercise-repo

echo "dummy" > dummy.txt
git add dummy.txt
Expand Down
2 changes: 1 addition & 1 deletion ignore/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="basic-ignore"
makerepo
make-exercise-repo

echo "hello" > file1.txt
git init
Expand Down
2 changes: 1 addition & 1 deletion investigation/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Include utils
source ../utils/utils.sh
makerepo
make-exercise-repo

touch test.md
git add test.md
Expand Down
2 changes: 1 addition & 1 deletion merge-conflict/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="merge-conflict"
makerepo
make-exercise-repo

touch greeting.txt
git add greeting.txt
Expand Down
2 changes: 1 addition & 1 deletion merge-driver/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="merge-driver"
makerepo
make-exercise-repo

cp ../../utils/resources/merge-tst-files.sh merge-tst-files.sh
git add merge-tst-files.sh
Expand Down
2 changes: 1 addition & 1 deletion merge-mergesort/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh

kata="merge-mergesort"
makerepo
make-exercise-repo

cp ../base.py mergesort.py
git add mergesort.py
Expand Down
4 changes: 2 additions & 2 deletions pre-push/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#Include utils
source ../utils/utils.sh

makefakeremoterepo
clone_remote_to_exercise
make-bare-remote-repo
clone-remote-to-exercise

touch README.md
git add README.md
Expand Down
2 changes: 1 addition & 1 deletion rebase-branch/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ../utils/utils.sh
kata="rebase-branch"

makerepo
make-exercise-repo

touch greeting.txt
git add greeting.txt
Expand Down
2 changes: 1 addition & 1 deletion rebase-exec/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source ../utils/utils.sh

makerepo
make-exercise-repo

echo "#! /usr/bin/env bash" > 'test.sh'
echo 'echo "Running tests on commit $(git rev-parse --short HEAD)"' >> 'test.sh'
Expand Down
2 changes: 1 addition & 1 deletion rebase-interactive-autosquash/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source ../utils/utils.sh

makerepo
make-exercise-repo

git commit --allow-empty -m "Initial commit"

Expand Down
4 changes: 2 additions & 2 deletions reorder-the-history/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#Include utils
source ../utils/utils.sh

makefakeremoterepo
clone_remote_to_exercise
make-bare-remote-repo
clone-remote-to-exercise

echo "initial" > foo.txt
git add foo.txt
Expand Down
2 changes: 1 addition & 1 deletion reset/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

for i in {1..10}
do
Expand Down
2 changes: 1 addition & 1 deletion reverted-merge/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

echo "library-1.2.3" > lib.txt
echo "module using library-1.2.3" > mymodule.txt
Expand Down
2 changes: 1 addition & 1 deletion save-my-commit/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kata="kata6-save-my-commit"
# Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

echo "initial" > thing.txt
git add thing.txt
Expand Down
2 changes: 1 addition & 1 deletion squashing/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kata="kata2-squashing"
# Include utils
source ../utils/utils.sh

makerepo
make-exercise-repo

touch alsoafile.txt

Expand Down
2 changes: 1 addition & 1 deletion utils/clone-remote-to-exercise.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
clone_remote_to_exercise() {
clone-remote-to-exercise() {
rm -rf exercise/

# Clone remote
Expand Down
2 changes: 1 addition & 1 deletion utils/make-exercise-repo.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
makerepo() {
make-exercise-repo() {

# First cleanup if there is an old exercise repository
rm -rf exercise/
Expand Down
2 changes: 1 addition & 1 deletion utils/make-fake-remote.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
makefakeremoterepo() {
make-bare-remote-repo() {
# First cleanup if there is an old exercise repository
rm -rf remote/

Expand Down
2 changes: 1 addition & 1 deletion utils/make-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ clear-local-user() {

pre-setup () {
kata="$(basename $(pwd))" # kata: name of the exercise which is respective folder name
makerepo
make-exercise-repo
config-local-username
}

Expand Down

0 comments on commit eeb834c

Please sign in to comment.