Commit: c141989e152f4874cab63dfab6812920e5c6d0a6 - Fs-scripts (git)

Commit MetaInfo

• Revision: c141989e152f4874cab63dfab6812920e5c6d0a6 (tree)
• Zeit: 2024-04-06 09:21:01
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

simplify "if not"

Ändern Zusammenfassung

• modified: Compile/build.lua
• modified: Compile/lib/CompilerVer.lua
• modified: Compile/lib/Generate.lua
• modified: Compile/lib/mariadbCompile/conf.lua
• modified: Compile/lib/opensslCompile/conf.lua
• modified: Compile/lib/qtCompile/conf.lua

Diff

--- a/Compile/build.lua
+++ b/Compile/build.lua
@@ -7,10 +7,7 @@ local scriptFile = arg[0]
 local n, n2
 repeat
 	n = n2
-	n2 = string.find(scriptFile, "/", n and (n + 1) or 1)
-	if not n2 then
-		n2 = string.find(scriptFile, "\\", n and (n + 1) or 1)
-	end
+	n2 = string.find(scriptFile, "/", n and (n + 1) or 1) or string.find(scriptFile, "\\", n and (n + 1) or 1)
 until not n2
 
 scriptPath = (n and string.sub(scriptFile, 1, n - 1) or ".")

--- a/Compile/lib/CompilerVer.lua
+++ b/Compile/lib/CompilerVer.lua
@@ -68,10 +68,7 @@ end
 local gccCommon = function(isWin, executableName)
 	local script = ""
 
-	if not executableName then
-		executableName = "gcc"
-	end
-	
+	executableName = executableName or "gcc"
 	script = script .. executableName .. " -dumpfullversion -dumpversion"
 	if isWin then
 		script = script .. "\r\n"

--- a/Compile/lib/Generate.lua
+++ b/Compile/lib/Generate.lua
@@ -982,18 +982,12 @@ gen.generateBuildCommand = function(self, para)
 	if para.download and type(para.download) == "table" then
 		for _, url in ipairs(para.download) do
 			local filename, tool = filenameAndToolFromUrl(url)
-			if not paraCopy.DOWNLOADPACKAGE then
-				paraCopy.DOWNLOADPACKAGE = ""
-			end
+			paraCopy.DOWNLOADPACKAGE = paraCopy.DOWNLOADPACKAGE or ""
 			paraCopy.DOWNLOADPACKAGE = paraCopy.DOWNLOADPACKAGE .. self[para.template].download .. " \"" .. filename .. "\" \"" .. url .. "\"\n"
-			if not paraCopy.UNCOMPRESSPACKAGE then
-				paraCopy.UNCOMPRESSPACKAGE = ""
-			end
+			paraCopy.UNCOMPRESSPACKAGE = paraCopy.UNCOMPRESSPACKAGE or ""
 			if tool then
 				paraCopy.UNCOMPRESSPACKAGE = paraCopy.UNCOMPRESSPACKAGE .. self[para.template].extract[tool] .. " \"" .. filename .. "\"\n"
-				if not paraCopy.DELETEUNCOMPRESSED then
-					paraCopy.DELETEUNCOMPRESSED = ""
-				end
+				paraCopy.DELETEUNCOMPRESSED = paraCopy.DELETEUNCOMPRESSED or ""
 				paraCopy.DELETEUNCOMPRESSED = paraCopy.DELETEUNCOMPRESSED .. self[para.template].delete .. " \"" .. filename .. "\"\n"
 			end
 		end
@@ -1019,18 +1013,14 @@ gen.generateBuildCommand = function(self, para)
 	end
 
 	local ret = string.gsub(template, "%&([%w_]+)%&", function(s)
-		if paraCopy[s] then
-			return paraCopy[s]
-		else
-			return ""
-		end
+		return paraCopy[s] or ""
 	end)
 
 	return ret
 end
 
 gen.dumpConfTable = function(self, para, indent)
-	if not indent then indent = 1 end
+	indent = indent or 1
 
 	local returnText = "{\n"
 	local keys = {}

--- a/Compile/lib/mariadbCompile/conf.lua
+++ b/Compile/lib/mariadbCompile/conf.lua
@@ -990,9 +990,7 @@ for name, value in pairs(conf) do
 		value.crossCompile = false
 	end
 
-	if not value.variant then
-		value.variant = {}
-	end
+	value.variant = value.variant or {}
 
 	value.binaryPackageUrlunix = "http://10.0.1.6:8080/job/MariaDB/job/" .. name .. "/lastSuccessfulBuild/artifact/buildDir/" .. value.name .. ".tar.xz"
 	value.sourcePackageUrlunix = "http://10.0.1.6/webdav/sources/mariadb-connector-c-" .. value.mariadbVersion .. "-src.tar.gz"

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -1307,9 +1307,7 @@ for name, value in pairs(conf) do
 		value.crossCompile = false
 	end
 
-	if not value.variant then
-		value.variant = {}
-	end
+	value.variant = value.variant or {}
 
 	value.binaryPackageUrlunix = "http://10.0.1.6:8080/job/OpenSSL/job/" .. name .. "/lastSuccessfulBuild/artifact/buildDir/" .. value.name .. ".tar.xz"
 	value.sourcePackageUrlunix = "http://10.0.1.6/webdav/sources/openssl-" .. value.opensslVersion .. ".tar.gz"

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -6775,9 +6775,7 @@ for name, value in pairs(conf) do
 		value.crossCompile = false
 	end
 
-	if not value.variant then
-		value.variant = {}
-	end
+	value.variant = value.variant or {}
 
 	local qtVersionSplit = split(value.qtVersion, ".")
 	local qtSourcePackagePrefix = "qt-everywhere-src-"