core: add api run_in_script

Author: Sunrisepeak

core/common.lua

@@ -52,7 +52,7 @@ function xlings_config_file_parse(filename)
             end
         }
     }
-    
+
     if not file then
         cprint("${yellow}[xlings]: " .. err)
         os.sleep(1000)
@@ -105,19 +105,47 @@ function xlings_save_config_to_file(config, file)
 end
 
 function xlings_exec(cmd)
-    os.exec(platform.get_config_info().cmd_wrapper .. tostring(cmd))
+    if is_host("windows") then
+        xlings_run_in_script(cmd)
+    else
+        os.exec(cmd)
+    end
+end
+
+function xlings_run_in_script(content, use_adnim)
+    if is_host("windows") then
+        xlings_run_bat_script(content, use_adnim)
+    else
+        xlings_run_shell_script(content, use_adnim)
+    end
 end
 
 function xlings_run_bat_script(content, use_adnim) -- only for windows
     local script_file = path.join(platform.get_config_info().rcachedir, "win_tmp.bat")
-    xlings_create_file_and_write(script_file, content)
+    xlings_create_file_and_write(script_file, string.format([[
+@echo off
+
+::dont modify this file, this file is generated by xlings
+
+%s
+        ]], content or ""))
     if use_adnim then
         os.exec([[powershell -Command "Start-Process ']] .. script_file .. [[' -Verb RunAs -Wait]])
     else
         os.exec(script_file)
     end
 end
 
+function xlings_run_shell_script(content, use_adnim) -- only for linux
+    local script_file = path.join(platform.get_config_info().rcachedir, "linux_tmp.sh")
+    xlings_create_file_and_write(script_file, content)
+    if use_adnim then
+        os.exec([[sudo bash ']] .. script_file .. [[']])
+    else
+        os.exec("bash " .. script_file)
+    end
+end
+
 function xlings_python(file)
     if os.host() == "windows" then
         file = file:gsub("/", "\\")
@@ -212,13 +240,13 @@ function xlings_path_format(path)
     path = tostring(path)
 
     path = path:gsub("\\", "/")
-    
+
     -- remove ./
     path = path:gsub("%./", "")
-    
+
     -- remove ../
     --path = path:gsub("%.%.%/", "")
-    
+
     -- /// -> /
     path = path:gsub("/+", "/")
 
@@ -253,7 +281,7 @@ function get_linux_distribution()
     if os_release then
         local content = os_release:read("*a")
         os_release:close()
-        
+
         local id = content:match('ID=["]*([^"\n]+)["]*')
         local version = content:match('VERSION_ID=["]*([^"\n]+)["]*')
         local name = content:match('PRETTY_NAME=["]*([^"\n]+)["]*')
@@ -263,7 +291,7 @@ function get_linux_distribution()
             name = name:lower()
             name = name:gsub("%s+%d[%d%.]*%s*.*$", "")
         end
-        
+
         return {
             id = id or "unknown",
             version = version or "unknown",

core/d2x/actions/checker.lua

@@ -331,7 +331,7 @@ function main(start_target, opt)
                             if open_file_cmd_template then
                                 for _, file in ipairs((files)) do
                                     file = path.absolute(file)
-                                    os.exec(platform.get_config_info().cmd_wrapper .. string.format(open_file_cmd_template, file))
+                                    common.xlings_run_in_script(string.format(open_file_cmd_template, file))
                                 end
                             end
 

core/xim/libxpkg/system.lua

@@ -23,7 +23,7 @@ end
 
 function subos_sysrootdir()
     local osname = os.host()
-    if is_host("linux") then 
+    if is_host("linux") then
         osname = "linux"
     end
     return path.join(platform.get_config_info().subosdir, osname)
@@ -58,6 +58,10 @@ function exec(cmd, opt)
     end
 end
 
+function run_in_script(content, admin)
+    common.run_in_script(content, admin)
+end
+
 function unix_api()
     return {
         append_to_shell_profile = __unix_append_to_shell_profile,
@@ -104,4 +108,4 @@ function __unix_append_to_shell_profile(config)
     if config.fish then
         config_shell(fish_profile, config.fish)
     end
-end
+end