From 236dfbfefaaa3a4767414f359d2cd922f2474973 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Mon, 10 Oct 2022 17:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8=E4=B8=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start.sh  | 51 ++++++++++++++++++++++++++-------------------------
 update.sh | 11 +++++------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/start.sh b/start.sh
index 3b844df..baad3b8 100644
--- a/start.sh
+++ b/start.sh
@@ -7,32 +7,33 @@ else
 fi
 if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
   echo "-- First container startup --"
-    # 此处插入你要执行的命令或者脚本文件
-    echo "升级pip"
-    python -m pip install --upgrade pip
-    echo "拉取PTools最新代码"
-    # 设置拉取最新文件并覆盖
-    git config pull.ff only
-    git pull origin $DEV
-    echo "列出代码文件信息"
-    ls -l
-    echo "安装pip依赖"
-    pip install -r requirements.txt
-    echo "初始化数据库"
-    python manage.py makemigrations
-    python manage.py migrate
-    python manage.py loaddata pt.json
-    touch $CONTAINER_ALREADY_STARTED
-    echo "创建超级用户"
-    DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME
-    DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL
-    DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD
-    python manage.py createsuperuser --noinput
-    echo "初始化完成"
+  # 此处插入你要执行的命令或者脚本文件
+  echo "升级pip"
+  python -m pip install --upgrade pip
+  echo "拉取PTools最新代码"
+  # 设置拉取最新文件并覆盖
+  git config pull.ff only
+  git pull
+  git pull origin $DEV
+  echo "列出代码文件信息"
+  ls -l
+  echo "安装pip依赖"
+  pip install -r requirements.txt
+  echo "初始化数据库"
+  python manage.py makemigrations
+  python manage.py migrate
+  python manage.py loaddata pt.json
+  touch $CONTAINER_ALREADY_STARTED
+  echo "创建超级用户"
+  DJANGO_SUPERUSER_USERNAME=$DJANGO_SUPERUSER_USERNAME
+  DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL
+  DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD
+  python manage.py createsuperuser --noinput
+  echo "初始化完成"
 else
   echo "-- Not first container startup --"
 fi
- echo "写入U2 hosts"
- echo 172.64.153.252 u2.dmhy.org >>/etc/hosts
+echo "写入U2 hosts"
+echo 172.64.153.252 u2.dmhy.org >>/etc/hosts
 echo "启动服务"
-  python manage.py runserver 0.0.0.0:$DJANGO_WEB_PORT
+python manage.py runserver 0.0.0.0:$DJANGO_WEB_PORT
diff --git a/update.sh b/update.sh
index fb47550..1adea80 100755
--- a/update.sh
+++ b/update.sh
@@ -1,7 +1,6 @@
 # 先备份数据库文件再拉取更新 $(date "+%Y%m%d%H%M%S")当前时间年月日时分秒
-cp /var/www/html/ptools/db/db.sqlite3 /var/www/html/ptools/db/db.sqlite3-$(date "+%Y%m%d%H%M%S") &&
-  git pull origin $DEV &&
-  cp -f /var/www/html/ptools/start.sh /var/www/html/start.sh &&
-  pip install -r requirements.txt -U &&
-  python manage.py makemigrations &&
-  python manage.py migrate
+cp /var/www/html/ptools/db/db.sqlite3 /var/www/html/ptools/db/db.sqlite3-$(date "+%Y%m%d%H%M%S")
+git pull
+pip install -r requirements.txt
+python manage.py makemigrations
+python manage.py migrate