Improve the init tool & fix the deploy tool.

cotes2020 · cotes2020 · commit 7b9791f7082c · 2020-09-04T20:38:20.000+08:00
diff --git a/tools/deploy.sh b/tools/deploy.sh
@@ -24,7 +24,7 @@ init() {
 }
 
 backup() {
-  mv _site "$_backup_dir"
+  mv _site/* "$_backup_dir"
   mv .git "$_backup_dir"
 
   # When adding custom domain from Github website,
diff --git a/tools/init.sh b/tools/init.sh
@@ -24,13 +24,18 @@ help() {
 check_init() {
   local _has_inited=false
 
-  if [[ -d .github ]]; then
-    if [[ -f .github/workflows/$ACTIONS_WORKFLOW && \
-      $(find .github/workflows/ -type f -name "*.yml" | wc -l) == 1 ]]; then
-      _has_inited=true
+  if [[ ! -d docs ]]; then
+    if [[ ! -d .github ]]; then
+      _has_inited=true # --no-gh
+    else
+      if [[ -f .github/workflows/$ACTIONS_WORKFLOW ]]; then
+        # on BSD, the `wc` could contains blank
+        local _count="$(find .github/workflows/ -type f -name "*.yml" | wc -l)"
+        if [[ ${_count//[[:blank:]]/} == 1 ]]; then
+          _has_inited=true
+        fi
+      fi
     fi
-  else
-    _has_inited=true
   fi
 
   if $_has_inited; then

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ init() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`backup() {`
`27`		`- mv _site "$_backup_dir"`
	`27`	`+ mv _site/* "$_backup_dir"`
`28`	`28`	`mv .git "$_backup_dir"`
`29`	`29`
`30`	`30`	`# When adding custom domain from Github website,`