Skip to content

Commit 57be77d

Browse files
committed
Tidy up and consolidate scripts
1 parent dfef7ca commit 57be77d

6 files changed

Lines changed: 105 additions & 58 deletions

File tree

doit.pl

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env perl
12
use Data::Dumper;
23
use Cwd;
34

@@ -62,7 +63,7 @@
6263
}
6364

6465
#
65-
# Read existing entires.
66+
# Read existing entires.
6667
# If option A and `newId` is defined is used the commit will be assumed done.
6768
# If option B is used and `cached` is defined the commit messages
6869
# will be re-done, but the contents will not be re-done.

init.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

push.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

run.sh

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
create_tmp_git_repo() {
5+
mkdir -p git
6+
sudo mount -t tmpfs -o size=512M none git
7+
cd git
8+
ln -s ../git-disk/.git .
9+
}
10+
11+
push_diff() {
12+
git push diff diff $( for f in $(git tag -l | grep -F diff/); do echo $f:$(basename $f); done )
13+
}
14+
15+
update_existing_git-disk() {
16+
: ${SCOWL_BRANCH:=v2}
17+
export SCOWL_BRANCH
18+
: ${DIFF_BRANCH:=diff}
19+
export DIFF_BRANCH
20+
ROOTDIR="$PWD"
21+
cd git-disk
22+
23+
git reset --hard
24+
git clean -xfd
25+
git fetch src
26+
git checkout "$SCOWL_BRANCH"
27+
git reset --hard src/"$SCOWL_BRANCH"
28+
29+
#git fetch diff
30+
#git branch -f diff diff/diff
31+
32+
cd ..
33+
34+
if ! mountpoint -q git; then
35+
./init.sh;
36+
fi
37+
38+
cd git
39+
PATH="$ROOTDIR/bin:$PATH" ../doit.pl
40+
41+
echo 'now do: cd git; ../run.sh 2'
42+
}
43+
44+
setup_git-disk() {
45+
rm -rf git-disk
46+
git init git-disk
47+
cd git-disk
48+
git remote add src git@github.com:en-wl/wordlist.git
49+
#git remote add src "${HOME}/wordlist/v2-pub"
50+
git remote add diff git@github.com:en-wl/wordlist-diff.git
51+
git fetch src v1
52+
git fetch src
53+
git fetch diff diff
54+
git branch v2 src/v2
55+
git branch diff diff/diff
56+
git checkout v2
57+
git replace --graft 0ff67eb0ba18648fbf0a55b69962038401d5074c src/v1
58+
}
59+
60+
process_answer() {
61+
if [[ -v yn ]]; then
62+
answer="${yn},${REPLY}"
63+
else
64+
answer="${1}"
65+
fi
66+
case "${answer}" in
67+
"Create tmp git repo,1" | "1" )
68+
create_tmp_git_repo; exit ;;
69+
"Push diff,2" | "2" )
70+
push_diff; exit ;;
71+
"Update existing git-disk,3" | "3" )
72+
update_existing_git-disk; exit ;;
73+
"Setup git-disk,4" | "4" )
74+
setup_git-disk; exit ;;
75+
* )
76+
echo "Wrong option supplied! Options were: "
77+
answer_num=1
78+
for answer in "${answer_options[@]}"; do
79+
echo "${answer_num}) ${answer}"
80+
answer_num=$((answer_num + 1))
81+
done
82+
exit 1;;
83+
esac
84+
}
85+
86+
show_menu() {
87+
PS3="Select a script to run: "
88+
select yn in "${answer_options[@]}"; do
89+
process_answer
90+
done
91+
}
92+
93+
answer_options=(
94+
"Create tmp git repo"
95+
"Push diff"
96+
"Update existing git-disk"
97+
"Setup git-disk")
98+
99+
if [[ ${#} -eq 0 ]]; then
100+
show_menu
101+
else
102+
process_answer "${1}"
103+
fi

setup.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

update.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)