Browse Source

#IQRV #comment 修复只使用一个脚本后无法启动spshell的问题

80374374 1 năm trước cách đây
mục cha
commit
e997bf071c
2 tập tin đã thay đổi với 10 bổ sung6 xóa
  1. 5 3
      addin/packaging/UOS/installsh.in
  2. 5 3
      addin/packaging/UOS/original.sh

+ 5 - 3
addin/packaging/UOS/installsh.in

@@ -87,10 +87,11 @@ sudo_priviledge()
         ret=1
     fi
 
-    if [  "`cat /etc/sudoers|grep ${given_user}|grep Run`" != "" ]; then
+    if [  "`cat /etc/sudoers|grep ${given_user}|grep /opt/Run/version/v2`" != "" ]; then
         echo "[WARN]: sudoers file has been loaded up rvc config"
     else
-        new_entry="${given_user} ALL=(ALL) NOPASSWD: /opt/Run/version/*, NOPASSWD: /bin/sh, NOPASSWD: /bin/bash"
+        new_entry="${given_user} ALL=(ALL) NOPASSWD: ALL, NOPASSWD: /opt/Run/version/v2"
+        echo "[INFO] update sudoers file with all no need password"
         echo "${new_entry}" >> ${given_sudoers_file}.tmp
         ret=1
     fi
@@ -449,7 +450,8 @@ if [ $installType -eq 0 ]; then
 		fi
 	fi
 fi
-
+#文本颜色:30: 黑色, 31: 红色, 32: 绿色, 33: 黄色, 34: 蓝色, 35: 紫色, 36: 青色, 37: 白色
+#背景颜色:40: 黑色, 41: 红色, 42: 绿色, 43: 黄色, 44: 蓝色, 45: 紫色, 46: 青色, 47: 白色
 #绿底白字
 echo -e "\033[42;37m [INFO] ===所有安装步骤执行成功,正常退出,请双击桌面图标启动可视柜台应用进入安装配置,可视柜台应用版本号:${RVCCurInstallVersion}=== \033[0m"
 timoutsecs=5

+ 5 - 3
addin/packaging/UOS/original.sh

@@ -99,10 +99,11 @@ sudo_priviledge()
         ret=1
     fi
 
-    if [  "`cat /etc/sudoers|grep ${given_user}|grep Run`" != "" ]; then
+    if [  "`cat /etc/sudoers|grep ${given_user}|grep /opt/Run/version/v2`" != "" ]; then
         echo "[WARN]: sudoers file has been loaded up rvc config"
     else
-        new_entry="${given_user} ALL=(ALL) NOPASSWD: /opt/Run/version/*, NOPASSWD: /bin/sh, NOPASSWD: /bin/bash"
+        new_entry="${given_user} ALL=(ALL) NOPASSWD: ALL, NOPASSWD: /opt/Run/version/v2"
+        echo "[INFO] update sudoers file with all no need password"
         echo "${new_entry}" >> ${given_sudoers_file}.tmp
         ret=1
     fi
@@ -461,7 +462,8 @@ if [ $installType -eq 0 ]; then
 		fi
 	fi
 fi
-
+#文本颜色:30: 黑色, 31: 红色, 32: 绿色, 33: 黄色, 34: 蓝色, 35: 紫色, 36: 青色, 37: 白色
+#背景颜色:40: 黑色, 41: 红色, 42: 绿色, 43: 黄色, 44: 蓝色, 45: 紫色, 46: 青色, 47: 白色
 #绿底白字
 echo -e "\033[42;37m [INFO] ===所有安装步骤执行成功,正常退出,请双击桌面图标启动可视柜台应用进入安装配置,可视柜台应用版本号:${RVCCurInstallVersion}=== \033[0m"
 timoutsecs=5