diff options
| author | Roy Ivy III <[email protected]> | 2020-02-22 20:32:11 -0600 |
|---|---|---|
| committer | Roy Ivy III <[email protected]> | 2020-02-22 20:37:57 -0600 |
| commit | d76b2b96872e3860af34b3256bc1df2189835829 (patch) | |
| tree | fe17b4bbc5b5105f2cdd0840fe1b6d17e2d9602f | |
| parent | f1a390e71d8c96ab005b01115e04ad109ea44d77 (diff) | |
change ~ remove unnecessary trailing `${clear}` from cprint()'s
25 files changed, 40 insertions, 40 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua index 1d93ea7e0..4c7224b2d 100644 --- a/xmake/actions/build/main.lua +++ b/xmake/actions/build/main.lua @@ -137,6 +137,6 @@ function main() -- trace if option.get("rebuild") then - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end end diff --git a/xmake/actions/config/scangen.lua b/xmake/actions/config/scangen.lua index 6590ffa37..633d1fb3b 100644 --- a/xmake/actions/config/scangen.lua +++ b/xmake/actions/config/scangen.lua @@ -156,5 +156,5 @@ function main() end -- trace - cprint("${color.success}xmake.lua generated, scan ok!${clear}") + cprint("${color.success}xmake.lua generated, scan ok!") end diff --git a/xmake/actions/create/main.lua b/xmake/actions/create/main.lua index c70697e07..cb421acec 100644 --- a/xmake/actions/create/main.lua +++ b/xmake/actions/create/main.lua @@ -143,5 +143,5 @@ function main() _create_project(option.get("language"), option.get("template"), targetname) -- trace - cprint("${color.success}create ok!${clear}") + cprint("${color.success}create ok!") end diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua index dd72145ce..bd2a13813 100644 --- a/xmake/actions/install/main.lua +++ b/xmake/actions/install/main.lua @@ -82,7 +82,7 @@ function main() install(targetname or ifelse(option.get("all"), "__all", "__def")) -- trace - cprint("${color.success}install ok!${clear}") + cprint("${color.success}install ok!") end, catch @@ -100,7 +100,7 @@ function main() install(targetname or ifelse(option.get("all"), "__all", "__def")) -- trace - cprint("${color.success}install ok!${clear}") + cprint("${color.success}install ok!") -- ok return true @@ -126,7 +126,7 @@ function main() sudo.runl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or ifelse(option.get("all"), "__all", "__def"), option.get("installdir"), option.get("prefix")}) -- trace - cprint("${color.success}install ok!${clear}") + cprint("${color.success}install ok!") ok = true end end diff --git a/xmake/actions/require/impl/action/install.lua b/xmake/actions/require/impl/action/install.lua index ca0a45da2..ce927c096 100644 --- a/xmake/actions/require/impl/action/install.lua +++ b/xmake/actions/require/impl/action/install.lua @@ -244,7 +244,7 @@ function main(package) if not package:requireinfo().optional then if os.isfile(errorfile) then print("if you want to get verbose errors, please see:") - cprint(" -> ${bright}%s${clear}", errorfile) + cprint(" -> ${bright}%s", errorfile) end raise("install failed!") end diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua index 5954c14ac..9a96e34d6 100644 --- a/xmake/actions/require/impl/package.lua +++ b/xmake/actions/require/impl/package.lua @@ -680,12 +680,12 @@ function _install_packages(packages_install, packages_download) -- trace utils.clearline() - cprintf("${yellow} => ${clear}") + cprintf("${yellow} => ") if #downloading > 0 then - cprintf("downloading ${magenta}%s${clear}", table.concat(downloading, ", ")) + cprintf("downloading ${magenta}%s", table.concat(downloading, ", ")) end if #installing > 0 then - cprintf("%sinstalling ${magenta}%s${clear}", #downloading > 0 and ", " or "", table.concat(installing, ", ")) + cprintf("%sinstalling ${magenta}%s", #downloading > 0 and ", " or "", table.concat(installing, ", ")) end cprintf(" .. %s%s", tips and ("${dim}" .. tips .. "${clear} ") or "", waitchars[waitindex + 1]) io.flush() diff --git a/xmake/actions/require/info.lua b/xmake/actions/require/info.lua index 1f8af83f7..96582c328 100644 --- a/xmake/actions/require/info.lua +++ b/xmake/actions/require/info.lua @@ -120,7 +120,7 @@ function main(package_names) print(" -> %s", filter.handle(url, instance)) local sourcehash = instance:sourcehash(instance:url_alias(url)) if sourcehash then - cprint(" -> ${yellow}%s${clear}", sourcehash) + cprint(" -> ${yellow}%s", sourcehash) end end end diff --git a/xmake/actions/require/scan.lua b/xmake/actions/require/scan.lua index abb4a88b9..7a881fe81 100644 --- a/xmake/actions/require/scan.lua +++ b/xmake/actions/require/scan.lua @@ -51,13 +51,13 @@ function _scan_package(packagedir) end local manifest_file = path.join(hashdir, "manifest.txt") local manifest = os.isfile(manifest_file) and io.load(manifest_file) or nil - cprintf(" -> ${yellow}%s${clear}: ${green}%s, %s${clear}", hash, manifest and manifest.plat or "", manifest and manifest.arch or "") + cprintf(" -> ${yellow}%s${clear}: ${green}%s, %s", hash, manifest and manifest.plat or "", manifest and manifest.arch or "") if os.emptydir(hashdir) then - cprintf(", ${red}empty${clear}") + cprintf(", ${red}empty") elseif not referenced then - cprintf(", ${red}unused${clear}") + cprintf(", ${red}unused") elseif not manifest then - cprintf(", ${red}invalid${clear}") + cprintf(", ${red}invalid") end print("") if manifest and manifest.configs then diff --git a/xmake/actions/uninstall/main.lua b/xmake/actions/uninstall/main.lua index 15aaea074..a2ccd7284 100644 --- a/xmake/actions/uninstall/main.lua +++ b/xmake/actions/uninstall/main.lua @@ -44,7 +44,7 @@ function main() uninstall(targetname) -- trace - cprint("${color.success}uninstall ok!${clear}") + cprint("${color.success}uninstall ok!") end, catch @@ -62,7 +62,7 @@ function main() uninstall(targetname) -- trace - cprint("${color.success}uninstall ok!${clear}") + cprint("${color.success}uninstall ok!") -- ok return true @@ -88,7 +88,7 @@ function main() sudo.runl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", option.get("installdir"), option.get("prefix")}) -- trace - cprint("${color.success}uninstall ok!${clear}") + cprint("${color.success}uninstall ok!") ok = true end end diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua index 4eb947a8b..985bcb89f 100644 --- a/xmake/actions/update/main.lua +++ b/xmake/actions/update/main.lua @@ -289,7 +289,7 @@ function main() _uninstall() -- trace - cprint("${color.success}uninstall ok!${clear}") + cprint("${color.success}uninstall ok!") return end diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua index f95ca4c5b..6b0861b62 100644 --- a/xmake/modules/private/action/trybuild/autotools.lua +++ b/xmake/modules/private/action/trybuild/autotools.lua @@ -199,5 +199,5 @@ function build() os.vexec("make -j" .. option.get("jobs")) os.vexec("make install") cprint("output to ${bright}%s", artifacts_dir) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/bazel.lua b/xmake/modules/private/action/trybuild/bazel.lua index a77657902..b87020ad1 100644 --- a/xmake/modules/private/action/trybuild/bazel.lua +++ b/xmake/modules/private/action/trybuild/bazel.lua @@ -44,5 +44,5 @@ function build() -- do build local bazel = assert(find_tool("bazel"), "bazel not found!") os.vexecv(bazel.program, {"build"}) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua index f97ffa273..9007c53c8 100644 --- a/xmake/modules/private/action/trybuild/cmake.lua +++ b/xmake/modules/private/action/trybuild/cmake.lua @@ -122,5 +122,5 @@ function build() os.vexecv("make", {"install"}) end cprint("output to ${bright}%s", artifacts_dir) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/make.lua b/xmake/modules/private/action/trybuild/make.lua index 949ab4224..95f37cfaf 100644 --- a/xmake/modules/private/action/trybuild/make.lua +++ b/xmake/modules/private/action/trybuild/make.lua @@ -50,5 +50,5 @@ function build() table.insert(argv, "-j" .. option.get("jobs")) os.vexecv("make", argv) end - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/meson.lua b/xmake/modules/private/action/trybuild/meson.lua index 33fd0a7d5..1ce67de31 100644 --- a/xmake/modules/private/action/trybuild/meson.lua +++ b/xmake/modules/private/action/trybuild/meson.lua @@ -114,5 +114,5 @@ function build() os.vexecv(ninja.program, ninja_argv) os.vexecv(ninja.program, table.join("install", ninja_argv)) cprint("output to ${bright}%s", artifacts_dir) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/msbuild.lua b/xmake/modules/private/action/trybuild/msbuild.lua index 948b89f41..0cd00fef9 100644 --- a/xmake/modules/private/action/trybuild/msbuild.lua +++ b/xmake/modules/private/action/trybuild/msbuild.lua @@ -43,5 +43,5 @@ function build() -- do build os.vexec("msbuild \"%s\" -nologo -t:Build -p:Configuration=Release -p:Platform=%s", configfile, is_arch("x64") and "x64" or "Win32") - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/ndkbuild.lua b/xmake/modules/private/action/trybuild/ndkbuild.lua index 214508912..57e890606 100644 --- a/xmake/modules/private/action/trybuild/ndkbuild.lua +++ b/xmake/modules/private/action/trybuild/ndkbuild.lua @@ -65,5 +65,5 @@ function build() ndkbuild = ndkbuild .. ".cmd" end os.vexecv(ndkbuild, argv, {envs = {NDK_ROOT = ndk}}) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/ninja.lua b/xmake/modules/private/action/trybuild/ninja.lua index 894b6af23..efa8e77c0 100644 --- a/xmake/modules/private/action/trybuild/ninja.lua +++ b/xmake/modules/private/action/trybuild/ninja.lua @@ -51,5 +51,5 @@ function build() table.insert(ninja_argv, "-j") table.insert(ninja_argv, option.get("jobs")) os.vexecv(ninja.program, ninja_argv) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/scons.lua b/xmake/modules/private/action/trybuild/scons.lua index 926f0b38a..333d2cc5f 100644 --- a/xmake/modules/private/action/trybuild/scons.lua +++ b/xmake/modules/private/action/trybuild/scons.lua @@ -43,5 +43,5 @@ function build() -- do build local scons = assert(find_tool("scons"), "scons not found!") os.vexec(scons.program) - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/modules/private/action/trybuild/xcodebuild.lua b/xmake/modules/private/action/trybuild/xcodebuild.lua index f6b76fb1c..d50d9d061 100644 --- a/xmake/modules/private/action/trybuild/xcodebuild.lua +++ b/xmake/modules/private/action/trybuild/xcodebuild.lua @@ -43,5 +43,5 @@ function build() -- do build os.exec("xcodebuild build CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO") - cprint("${color.success}build ok!${clear}") + cprint("${color.success}build ok!") end diff --git a/xmake/plugins/doxygen/main.lua b/xmake/plugins/doxygen/main.lua index 69dc969ad..610053398 100644 --- a/xmake/plugins/doxygen/main.lua +++ b/xmake/plugins/doxygen/main.lua @@ -108,5 +108,5 @@ function main() -- trace cprint("${bright green}result: ${default green}%s/html/index.html", outputdir) - cprint("${color.success}doxygen ok!${clear}") + cprint("${color.success}doxygen ok!") end diff --git a/xmake/plugins/macro/main.lua b/xmake/plugins/macro/main.lua index 8e286da6e..cedbc173a 100644 --- a/xmake/plugins/macro/main.lua +++ b/xmake/plugins/macro/main.lua @@ -142,7 +142,7 @@ function _delete(macroname) end -- trace - cprint("${color.success}delete macro(%s) ok!${clear}", macroname) + cprint("${color.success}delete macro(%s) ok!", macroname) end -- import macro @@ -163,7 +163,7 @@ function _import(macrofile, macroname) os.cp(macrofile, _wfile(macroname)) -- trace - cprint("${color.success}import macro(%s) ok!${clear}", macroname) + cprint("${color.success}import macro(%s) ok!", macroname) end else @@ -171,7 +171,7 @@ function _import(macrofile, macroname) os.cp(macrofile, _wfile(macroname)) -- trace - cprint("${color.success}import macro(%s) ok!${clear}", macroname) + cprint("${color.success}import macro(%s) ok!", macroname) end end @@ -193,7 +193,7 @@ function _export(macrofile, macroname) os.cp(macrofile, outputdir) -- trace - cprint("${color.success}export macro(%s) ok!${clear}", path.basename(macrofile)) + cprint("${color.success}export macro(%s) ok!", path.basename(macrofile)) end end else @@ -201,7 +201,7 @@ function _export(macrofile, macroname) os.cp(_rfile(macroname), macrofile) -- trace - cprint("${color.success}export macro(%s) ok!${clear}", macroname) + cprint("${color.success}export macro(%s) ok!", macroname) end end @@ -283,7 +283,7 @@ function _end(macroname) _show(macroname) -- trace - cprint("${color.success}define macro(%s) ok!${clear}", macroname) + cprint("${color.success}define macro(%s) ok!", macroname) end -- run macro diff --git a/xmake/plugins/plugin/main.lua b/xmake/plugins/plugin/main.lua index 7e488ef1d..60be1200d 100644 --- a/xmake/plugins/plugin/main.lua +++ b/xmake/plugins/plugin/main.lua @@ -78,7 +78,7 @@ function _clear() end -- trace - cprint("${color.success}clear all installed plugins ok!${clear}") + cprint("${color.success}clear all installed plugins ok!") end -- main diff --git a/xmake/plugins/project/main.lua b/xmake/plugins/project/main.lua index af8d7a2cb..8fee9d9cc 100755 --- a/xmake/plugins/project/main.lua +++ b/xmake/plugins/project/main.lua @@ -87,5 +87,5 @@ function main() environment.leave("toolchains") -- trace - cprint("${color.success}create ok!${clear}") + cprint("${color.success}create ok!") end diff --git a/xmake/plugins/repo/main.lua b/xmake/plugins/repo/main.lua index 5295728d1..e9162496d 100644 --- a/xmake/plugins/repo/main.lua +++ b/xmake/plugins/repo/main.lua @@ -49,7 +49,7 @@ function _add(name, url, branch, is_global) end -- trace - cprint("${color.success}add %s repository(%s): %s%s ok!${clear}", ifelse(is_global, "global", "local"), name, url, branch and (" " .. branch) or "") + cprint("${color.success}add %s repository(%s): %s%s ok!", ifelse(is_global, "global", "local"), name, url, branch and (" " .. branch) or "") -- leave environment environment.leave() @@ -156,7 +156,7 @@ function _clear(is_global) end -- trace - cprint("${color.success}clear %s repositories: ok!${clear}", ifelse(is_global, "global", "local")) + cprint("${color.success}clear %s repositories: ok!", ifelse(is_global, "global", "local")) end -- list all repositories |
