Update server-ff.sh
Browse files- server-ff.sh +50 -17
server-ff.sh
CHANGED
|
@@ -34,25 +34,58 @@ max_wait=240 # 最大等待300秒（5分钟）
|
|
| 34 |
wait_interval=5 # 每5秒检查一次
|
| 35 |
elapsed=0
|
| 36 |
|
| 37 |
-
# /home/vncuser/ff.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 38 |
|
| 39 |
-
#
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
echo "
|
| 43 |
/home/vncuser/ff.sh
|
| 44 |
-
break
|
| 45 |
-
else
|
| 46 |
-
echo "⏳ 等待 profiles.ini 文件... (已等待 ${elapsed}秒)"
|
| 47 |
-
cat /home/vncuser/fff.log
|
| 48 |
-
sleep $wait_interval
|
| 49 |
-
elapsed=$((elapsed + wait_interval))
|
| 50 |
fi
|
| 51 |
-
done
|
| 52 |
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
echo "❌ 等待超时，profiles.ini 文件未在 ${max_wait} 秒内出现"
|
| 56 |
-
echo "⚠️ 尝试直接执行 ff.sh"
|
| 57 |
/home/vncuser/ff.sh
|
| 58 |
-
fi
|
|
|
|
| 34 |
wait_interval=5 # 每5秒检查一次
|
| 35 |
elapsed=0
|
| 36 |
|
| 37 |
+
# # /home/vncuser/ff.sh
|
| 38 |
+
|
| 39 |
+
# # 循环等待 profiles.ini 文件出现
|
| 40 |
+
# while [ $elapsed -lt $max_wait ]; do
|
| 41 |
+
# if [ -f "/home/vncuser/ff/.mozilla/firefox/profiles.ini" ]; then
|
| 42 |
+
# echo "✅ profiles.ini 文件已出现，执行 ff.sh"
|
| 43 |
+
# /home/vncuser/ff.sh
|
| 44 |
+
# break
|
| 45 |
+
# else
|
| 46 |
+
# echo "⏳ 等待 profiles.ini 文件... (已等待 ${elapsed}秒)"
|
| 47 |
+
# cat /home/vncuser/fff.log
|
| 48 |
+
# sleep $wait_interval
|
| 49 |
+
# elapsed=$((elapsed + wait_interval))
|
| 50 |
+
# fi
|
| 51 |
+
# done
|
| 52 |
+
|
| 53 |
+
# # 检查是否超时
|
| 54 |
+
# if [ $elapsed -ge $max_wait ]; then
|
| 55 |
+
# echo "❌ 等待超时，profiles.ini 文件未在 ${max_wait} 秒内出现"
|
| 56 |
+
# echo "⚠️ 尝试直接执行 ff.sh"
|
| 57 |
+
# /home/vncuser/ff.sh
|
| 58 |
+
# fi
|
| 59 |
+
|
| 60 |
+
# 定义需要检查的环境变量列表
|
| 61 |
+
# 检查 DATA_JSON, HF_USER1, HF_REPO, HF_EMAIL, HF_TOKEN1 是否都不为空
|
| 62 |
+
if [[ -n "$DATA_JSON" && -n "$HF_USER1" && -n "$HF_REPO" && -n "$HF_EMAIL" && -n "$HF_TOKEN1" ]]; then
|
| 63 |
+
echo "🚀 环境变量检查通过，开始循环等待 profiles.ini..."
|
| 64 |
+
|
| 65 |
+
# 循环等待 profiles.ini 文件出现
|
| 66 |
+
while [ $elapsed -lt $max_wait ]; do
|
| 67 |
+
if [ -f "/home/vncuser/ff/.mozilla/firefox/profiles.ini" ]; then
|
| 68 |
+
echo "✅ profiles.ini 文件已出现，执行 ff.sh"
|
| 69 |
+
/home/vncuser/ff.sh
|
| 70 |
+
break
|
| 71 |
+
else
|
| 72 |
+
echo "⏳ 等待 profiles.ini 文件... (已等待 ${elapsed}秒)"
|
| 73 |
+
# 注意：如果 fff.log 文件很大，cat 可能会刷屏，建议按需查看
|
| 74 |
+
[ -f /home/vncuser/fff.log ] && tail -n 5 /home/vncuser/fff.log
|
| 75 |
+
|
| 76 |
+
sleep $wait_interval
|
| 77 |
+
elapsed=$((elapsed + wait_interval))
|
| 78 |
+
fi
|
| 79 |
+
done
|
| 80 |
|
| 81 |
+
# 检查是否超时
|
| 82 |
+
if [ $elapsed -ge $max_wait ]; then
|
| 83 |
+
echo "❌ 等待超时，profiles.ini 文件未在 ${max_wait} 秒内出现"
|
| 84 |
+
echo "⚠️ 尝试直接执行 ff.sh"
|
| 85 |
/home/vncuser/ff.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 86 |
fi
|
|
|
|
| 87 |
|
| 88 |
+
else
|
| 89 |
+
echo "⚠️ 检测到必要环境变量为空，跳过等待，直接执行 ff.sh"
|
|
|
|
|
|
|
| 90 |
/home/vncuser/ff.sh
|
| 91 |
+
fi
|