Skip to content

Commit 71bb401

Browse files
committed
[update] : No use script mode for package.py
1 parent 9d454a7 commit 71bb401

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

build.sh

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -356,23 +356,12 @@ prepare_env() {
356356
local _check_failed=false _pkg _result=0 _version _local _latest
357357
msg_info "Checking dependencies ..."
358358
for _pkg in ${dependence[@]}; do
359-
msg_debug -n "Checking ${_pkg} ..."
360-
_version="$("${tools_dir}/package.py" -s "${_pkg}")" || _result="${?}"
359+
eval "${tools_dir}/package.py" "${_pkg}" $( [[ "${debug}" = false ]] && echo "> /dev/null") || _result="${?}"
361360
case "${_result}" in
362-
"0" | "1")
363-
[[ "${debug}" = true ]] && echo -ne " ${_version}\n"
364-
;;
365-
"1")
366-
echo; msg_warn "Failed to get the latest version of ${_pkg}."
367-
;;
368-
"2")
369-
_local="$(echo "${_version}" | getclm 1)"
370-
_latest="$(echo "${_version}" | getclm 2)"
371-
echo; msg_warn "The version of ${_pkg} installed in local does not match one of the latest.\nLocal: ${_local} Latest: ${_latest}"
372-
;;
373361
"3")
374-
[[ "${debug}" = true ]] && echo
375-
msg_error "${_pkg} is not installed." ; _check_failed=true
362+
#[[ "${debug}" = true ]] && echo
363+
#msg_error "${_pkg} is not installed."
364+
_check_failed=true
376365
;;
377366
"4")
378367
[[ "${debug}" = true ]] && echo

tools/package.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
def msg(string: str, level: str) -> None:
4040
if not args.script:
41-
run([f"{script_dir}/msg.sh", "-a", "package.py", level, string])
41+
run([f"{script_dir}/msg.sh", "-a", "package", "-s", "8", level, string])
4242

4343

4444
def get_from_localdb(package: str) -> Optional[Package]:
@@ -66,20 +66,20 @@ def compare(package: str) -> tuple[int,Optional[tuple[str]]]:
6666
pkg_from_sync = get_from_syncdb(pkg_from_local.name) if pkg_from_local else None
6767

6868
if not pkg_from_local:
69-
msg(f"{package} is not installed.", "error")
69+
msg(f"{package} is not installed", "error")
7070

7171
return (3, None)
7272
elif not pkg_from_sync:
73-
msg(f"Failed to get the latest version of {package}.", "warn")
73+
msg(f"Failed to get the latest version of {package}", "warn")
7474

7575
return (1, (pkg_from_local.version))
7676

7777
if pkg_from_local.version == pkg_from_sync.version:
78-
msg(f"The latest version of {package} is installed.", "info")
78+
msg(f"Latest {package} {pkg_from_local.version} is installed", "debug")
7979

8080
return (0, (pkg_from_local.version))
8181
else:
82-
msg(f"The version of {package} does not match one of the latest.", "warn")
82+
msg(f"The version of {package} does not match one of the latest", "warn")
8383
msg(f"Local: {pkg_from_local.version} Latest: {pkg_from_sync.version}", "warn")
8484

8585
return (2, (pkg_from_local.version, pkg_from_sync.version))

0 commit comments

Comments
 (0)