Skip to content

G
gfwlist
Commit 38cacb09 authored by lovely.wcm's avatar lovely.wcm
Browse files
Options

c2VuZEdGV0xpc3Q6IG9uZSBsb2cgcGVyIGxpbmUK

parent 90297155
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
sendGFWList.sh
View file @ 38cacb09
...@@ -51,21 +51,18 @@ do ...@@ -51,21 +51,18 @@ do
if (( $i%2 == 0 )); then # author if (( $i%2 == 0 )); then # author
temp=${log%%:*}; temp=${log%%:*};
convertedLog+=${temp%@*}; # don't include "@gmail.com" convertedLog+=${temp%@*}; # don't include "@gmail.com"
convertedLog+=":\""; convertedLog+=": ";
# discard used string # discard used string
log=${log#*:}; log=${log#*:};
else # log, decode it else # log, decode it
temp=$( echo ${log%%;*} | base64 -d); temp=$( echo ${log%%;*} | base64 -d);
convertedLog+=$temp; convertedLog+=$temp;
convertedLog+="\"; "; convertedLog+="\n";
log=${log#*;}; log=${log#*;};
fi fi
((i++)); ((i++));
done done
# replace last ";" symbol to "."
convertedLog=$( echo $convertedLog | sed 's/;$/\./' ) &&
# modified by others, commit to local git repository. # modified by others, commit to local git repository.
if [ "$convertedLog" != "" ]; then if [ "$convertedLog" != "" ]; then
svn update && svn update &&
...@@ -73,12 +70,11 @@ if [ "$convertedLog" != "" ]; then ...@@ -73,12 +70,11 @@ if [ "$convertedLog" != "" ]; then
# save local modification # save local modification
git diff > temp.patch && git diff > temp.patch &&
# log format: author1:"message1"; author2:"message2"...
base64 -d gfwlist.txt > list.txt && base64 -d gfwlist.txt > list.txt &&
git commit -a -m "$convertedLog"; echo -e $convertedLog | git commit -a -F - ;
# apply local modification # apply local modification
if [ -s temp.patch ]; then git apply temp.patch; fi && [ -s temp.patch ] && git apply temp.patch &&
rm temp.patch; rm temp.patch;
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment