Skip to content

G
gfwlist
Commit 03afb5b2 authored by lovelywcm's avatar lovelywcm
Browse files
Options

b25lIG1vcmUgZXJyb3IgaGFuZGxlcgo=

parent 29f8b918
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
sendGFWList.sh
View file @ 03afb5b2
...@@ -80,10 +80,15 @@ if [ "$convertedLog" != "" ]; then ...@@ -80,10 +80,15 @@ if [ "$convertedLog" != "" ]; then
echo -e $convertedLog | git commit -a -F - && echo -e $convertedLog | git commit -a -F - &&
[ -s temp.patch ] && git apply temp.patch && [ -s temp.patch ] && git apply temp.patch &&
rm temp.patch && rm temp.patch;
# remove (if exist) empty temp.patch if [ -s temp.patch ]; then
[ ! -s temp.patch -a -e temp.patch ] && rm temp.patch; echo "Error: git apply failed, your work saved at temp.patch";
exit 1;
elif [ -a temp.patch ]; then
# empty, remove it
rm temp.patch;
fi
fi fi
if [ "$(git diff)" == "" ]; then if [ "$(git diff)" == "" ]; then
......
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