From ee83be5df38ab04f40b8378ff313d15768df5b55 Mon Sep 17 00:00:00 2001 From: yangniao23 Date: Mon, 28 Sep 2020 23:29:40 +0900 Subject: [PATCH] =?utf8?q?Update:=20pkg=E3=83=87=E3=82=A3=E3=83=AC?= =?utf8?q?=E3=82=AF=E3=83=88=E3=83=AA=E3=81=A8sync=E3=83=87=E3=82=A3?= =?utf8?q?=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E3=81=AE=E4=B8=A1=E6=96=B9?= =?utf8?q?=E3=81=8C=E5=AD=98=E5=9C=A8=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88?= =?utf8?q?=E3=81=AB=E9=99=90=E3=82=8A=E3=83=9B=E3=82=B9=E3=83=88=E3=81=A8?= =?utf8?q?=E5=85=B1=E6=9C=89=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tools/docker-build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/docker-build.sh b/tools/docker-build.sh index 0ebdbb1c..f89aacb9 100755 --- a/tools/docker-build.sh +++ b/tools/docker-build.sh @@ -26,8 +26,7 @@ _usage () { } # Start define var -[[ -d /var/cache/pacman/pkg ]] && SHARE_PKG_DIR='/var/cache/pacman/pkg' || SHARE_PKG_DIR=${script_path}/cache/pkg -[[ -d /var/lib/pacman ]] && SHARE_DB_DIR='/var/lib/pacman/sync' || SHARE_DB_DIR=${script_path}/cache/sync +[[ -d /var/cache/pacman/pkg ]] && [[ -d /var/lib/pacman/sync ]] && SHARE_PKG_DIR='/var/cache/pacman/pkg' && SHARE_DB_DIR='/var/lib/pacman/sync' || SHARE_PKG_DIR=${script_path}/cache/pkg && SHARE_DB_DIR=${script_path}/cache/sync # End define var @@ -48,7 +47,7 @@ while (( $# > 0 )); do shift 1 ;; -p | --pkg-cache-dir) - [[ -d ${2} ]] && mkdir -p ${2}/pkg && mkdir -p ${2}/sync && SHARE_PKG_DIR=${2}/pkg && SHARE_DB_DIR=${2}/sync || echo "Error: The directory is not found or cannot make directory." 1>&2 + [[ -d ${2} ]] && mkdir -p ${2}/pkg && mkdir -p ${2}/sync && SHARE_PKG_DIR=${2}/pkg && SHARE_DB_DIR=${2}/sync || echo "Error: The directory is not found or cannot make directory." 1>&2 && exit 1 ;; -h | --help) _usage -- 2.11.0