From 18849d10cd1ceeeec63910412ac682f6ae589eac Mon Sep 17 00:00:00 2001
From: bigeagle <justin.w.xd@gmail.com>
Date: Tue, 22 Aug 2017 13:16:18 +0800
Subject: [PATCH] docker-ce: improve error handling

---
 docker-ce.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker-ce.sh b/docker-ce.sh
index 8940249..7e92151 100755
--- a/docker-ce.sh
+++ b/docker-ce.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# requires: wget, lftp, jq, python3.5, lxml, pyquery 
+# requires: lftp, jq, python3.5, lxml, pyquery 
 # set -x
 set -e 
 set -u 
@@ -17,8 +17,8 @@ LOCAL_FILELIST="${TUNASYNC_WORKING_DIR}/.filelist.local"
 
 function cleanup () {
 	echo "cleaning up"
-	[[ -f $REMOTE_FILELIST ]] && rm $REMOTE_FILELIST
-	[[ -f $LOCAL_FILELIST ]] && rm $LOCAL_FILELIST
+	[[ -f $REMOTE_FILELIST ]] && rm $REMOTE_FILELIST || true
+	[[ -f $LOCAL_FILELIST ]] && rm $LOCAL_FILELIST || true
 }
 
 trap cleanup EXIT
@@ -32,10 +32,10 @@ while read remote_url; do
 	echo "${dst_rel_file}" >> $REMOTE_FILELIST
 
 	if [[ -f ${dst_file} ]]; then
-		remote_meta=`curl -sI ${remote_url}`
-		remote_filesize=`echo -e "$remote_meta" | grep -i '^content-length:' | awk '{print $2}' | tr -d '\n\r'`
-		remote_date=`echo -e "$remote_meta" | grep -i '^last-modified:' | sed 's/^last-modified: //I' | tr -d '\n\r'`
-		remote_date=`date --date="$remote_date" +%s`
+		remote_meta=`curl -sI "${remote_url}"`
+		remote_filesize=`echo -e "$remote_meta" | grep -i '^content-length:' | awk '{print $2}' | tr -d '\n\r' || echo 0`
+		remote_date=`echo -e "$remote_meta" | grep -i '^last-modified:' | sed 's/^last-modified: //I' | tr -d '\n\r' || echo 0`
+		remote_date=`date --date="${remote_date}" +%s`
 
 		local_filesize=`stat -c "%s" ${dst_file}`
 		local_date=`stat -c "%Y" ${dst_file}`
@@ -50,7 +50,10 @@ while read remote_url; do
 	fi
 	
 	echo "downloading ${remote_url}"
-	(cd ${dst_dir} && wget -N -q ${remote_url} || rm ${dst_file})
+	curl -o ${dst_file} -s -L --remote-time --show-error --fail ${remote_url} || {
+		echo "Failed: ${remote_url}"
+		[[ -f ${dst_file} ]] && rm ${dst_file}
+	}
 done < <($GET_FILELIST $BASE_URL)
 
 # remove old files