Fix files r/w permissions under Linux Docker (cotes2020#145)

cotes2020 · cotes2020 · commit 2cae5721c0f8 · 2020-10-10T00:33:13.000+08:00
also improve the scripts
diff --git a/tools/build.sh b/tools/build.sh
@@ -31,7 +31,7 @@ _help() {
 }
 
 _install_tools() {
-  # docker image `jekyll/jekyll` based on Apline Linux
+  # docker image `jekyll/jekyll` based on Alpine Linux
   echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
   apk update
   apk add yq
diff --git a/tools/run.sh b/tools/run.sh
@@ -14,10 +14,11 @@ set -eu
 
 WORK_DIR="$(dirname "$(dirname "$(realpath "$0")")")"
 
-CONTAINER=.container
+CONTAINER="${WORK_DIR}/.container"
 SYNC_TOOL=_scripts/sh/sync_monitor.sh
 
-cmd="bundle exec jekyll s -l"
+cmd="bundle exec jekyll s"
+
 realtime=false
 docker=false
 
@@ -37,27 +38,32 @@ _help() {
 }
 
 _cleanup() {
-  if [[ -d _site || -d .jekyll-cache ]]; then
-    jekyll clean
-  fi
-
-  rm -rf "${WORK_DIR}/${CONTAINER}"
+  rm -rf "$CONTAINER"
   ps aux | grep fswatch | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1
 }
 
+_setup_docker() {
+  # docker image `jekyll/jekyll` based on Alpine Linux
+  echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
+  apk update
+  apk add yq
+
+  chown -R jekyll:jekyll "$CONTAINER"
+}
+
 _init() {
   if [[ -f Gemfile.lock ]]; then
     rm -f Gemfile.lock
   fi
 
-  if [[ -d "${WORK_DIR}/${CONTAINER}" ]]; then
-    rm -rf "${WORK_DIR}/${CONTAINER}"
+  if [[ -d $CONTAINER ]]; then
+    rm -rf "$CONTAINER"
   fi
 
-  temp="$(mktemp -d)"
-  cp -r "$WORK_DIR"/* "$temp"
-  cp -r "${WORK_DIR}/.git" "$temp"
-  mv "$temp" "${WORK_DIR}/${CONTAINER}"
+  local temp="$(mktemp -d)"
+  cp -r ./* "$temp"
+  cp -r ./.git "$temp"
+  mv "$temp" "$CONTAINER"
 
   trap _cleanup INT
 }
@@ -77,21 +83,8 @@ _check_command() {
   fi
 }
 
-_install_tools() {
-  # docker image `jekyll/jekyll` based on Apline Linux
-  echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
-  apk update
-  apk add yq
-}
-
-main() {
-  _init
-
-  if $docker; then
-    _install_tools
-  fi
-
-  cd "${WORK_DIR}/${CONTAINER}"
+_run() {
+  cd "$CONTAINER"
   bash _scripts/sh/create_pages.sh
   bash _scripts/sh/dump_lastmod.sh
 
@@ -110,16 +103,26 @@ main() {
       "$WORK_DIR" | xargs -0 -I {} bash "./${SYNC_TOOL}" {} "$WORK_DIR" . &
   fi
 
-  if ! $docker; then
-    cmd+=" -o"
-  else
+  if $docker; then
     cmd+=" -H 0.0.0.0"
+  else
+    cmd+=" -l -o"
   fi
 
   echo "\$ $cmd"
   eval "$cmd"
 }
 
+main() {
+  _init
+
+  if $docker; then
+    _setup_docker
+  fi
+
+  _run
+}
+
 while (($#)); do
   opt="$1"
   case $opt in

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ _help() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`_install_tools() {`
`34`		- # docker image `jekyll/jekyll` based on Apline Linux
	`34`	+ # docker image `jekyll/jekyll` based on Alpine Linux
`35`	`35`	`echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories`
`36`	`36`	`apk update`
`37`	`37`	`apk add yq`