diff --git a/install.sh b/install.sh index 67728d8..7ca9a0e 100755 --- a/install.sh +++ b/install.sh @@ -63,23 +63,18 @@ if [ $imgExist -eq 0 ]; then fi if [ -f ./machete.tar ]; then - # 2024-09-06更新 - sumok="b0e6ba7e8769ba0144d80035e0936a4c" - checkRes=`md5 machete.tar | grep -v grep | grep "${sumok}" | wc -l` - if [ $checkRes -gt 0 ]; then - echo "machete的docker镜像下载完成,即将导入docker" - docker image load --input machete.tar - # 再次确认image下载成功 - detectDockerImageExists "filesite/machete" - imgExist=$? - if [ $imgExist -eq 0 ]; then - echo "⚠️⚠️" - echo "machete的docker镜像导入失败,请检查网络后重试" - echo "" - exit 1 - else - echo "machete的docker镜像导入完成,即将开始安装相册和视频系统" - fi + echo "machete的docker镜像下载完成,即将导入docker" + docker image load --input machete.tar + # 再次确认image下载成功 + detectDockerImageExists "filesite/machete" + imgExist=$? + if [ $imgExist -eq 0 ]; then + echo "⚠️⚠️" + echo "machete的docker镜像导入失败,请检查网络后重试" + echo "" + exit 1 + else + echo "machete的docker镜像导入完成,即将开始安装相册和视频系统" fi fi fi