diff --git a/.cnb.yml.rej b/.cnb.yml.rej deleted file mode 100644 index 14c5b4b6..00000000 --- a/.cnb.yml.rej +++ /dev/null @@ -1,29 +0,0 @@ -diff a/.cnb.yml b/.cnb.yml (rejected hunks) -@@ -111,13 +111,14 @@ main: - script: - - | - cd /opt/login -+ ls -t login_v* 2>/dev/null | head -1 -+ # 获取最新的login二进制文件 - BIN_NAME=$(ls -t login_v* 2>/dev/null | head -1) -- echo "BIN_NAME: $BIN_NAME" - if [ -z "$BIN_NAME" ]; then - echo "❌ 未找到可执行的login文件" - exit 1 - fi -- echo "📦 启动Login服务 | Binary: $BIN_NAME" -+ echo "📦 启动Login服务 | Binary: ${BIN_NAME}" - # 停止旧的screen会话 - session_name="login" - session=$(screen -ls 2>/dev/null | grep -o "[0-9]*\.${session_name}" || true) -@@ -143,8 +144,8 @@ main: - LOGIC_BIN=$(ls -t logic_v* 2>/dev/null | head -1) - if [ -n "$LOGIC_BIN" ]; then - mkdir -p /opt/login/public -- mv $LOGIC_BIN /opt/login/public/ -- echo "✅ Logic产物已移动到 /opt/login/public/ | 文件: $(basename $LOGIC_BIN)" -+ mv ${LOGIC_BIN} /opt/login/public/ -+ echo "✅ Logic产物已移动到 /opt/login/public/ | 文件: $(basename ${LOGIC_BIN})" - else - echo "⚠️ 未找到Logic产物" - fi