add

qiaojialiang/demo01.py

@@ -8,13 +8,16 @@ date_str = now.strftime("%Y-%m-%d")
 # 定义日志文件名
 log_file = f"script_output_{date_str}.log"
 
+n1 = 1
+n2 = 5
+
 # 定义Shell脚本的路径
 script1_path = "./script1.sh"
-script2_path = "./script1.sh"
+script2_path = "./script2.sh"
 
 with open(log_file, 'w') as f:
     # 调用script1.sh
-    result = subprocess.run([script1_path], shell=True, stdout=f, stderr=subprocess.STDOUT)
+    result = subprocess.run([script1_path, str(n1), str(n2)], shell=True, stdout=f, stderr=subprocess.STDOUT)
 
     # 检查返回码
     if result.returncode == 0:

qiaojialiang/script1.sh

@@ -1,10 +1,31 @@
 #!/bin/bash
 
-# 使用for循环输出1到5的数字
-for i in {1..5}
+# 检查是否提供了两个参数
+if [ "$#" -ne 2 ]; then
+    echo "用法: $0 n1 n2"
+    echo "此脚本输出从n1到n2（包含）的所有数字。"
+    exit 1
+fi
+
+n1=$1
+n2=$2
+
+# 检查n1和n2是否为整数
+if ! [[ "$n1" =~ ^[0-9]+$ ]] || ! [[ "$n2" =~ ^[0-9]+$ ]]; then
+    echo "错误：n1和n2都必须是正整数。"
+    exit 1
+fi
+
+# 确保n1不大于n2
+if [ "$n1" -gt "$n2" ]; then
+    echo "错误：n1必须小于或等于n2。"
+    exit 1
+fi
+
+# 输出从n1到n2的数字
+for (( i=$n1; i<=$n2; i++ ))
 do
     echo $i
-    # 等待1秒
     sleep 1
 done