From f8351e033dccf5e6f158ee707328c9360b48d3c6 Mon Sep 17 00:00:00 2001 From: Martinez Date: Sat, 26 Dec 2015 16:55:59 +0100 Subject: [PATCH] remove unused return_value parameter --- libexec/render.py | 19 +++++++++---------- share/zsh-init | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libexec/render.py b/libexec/render.py index 6879ca3..8fd0b02 100755 --- a/libexec/render.py +++ b/libexec/render.py @@ -112,16 +112,15 @@ class Sysload: class Settings: def __init__(self, argv): try: - self.return_value = int(argv[1]) - self.term_width = int(argv[2]) - self.last_refresh = int(argv[3]) if argv[3] else None - self.load_warn = float(argv[4]) - self.load_error = float(argv[5]) - self.space_warn = float(argv[6]) - self.space_error = float(argv[7]) + self.term_width = int(argv[1]) + self.last_refresh_time = int(argv[2]) if argv[2] else None + self.load_warn = float(argv[3]) + self.load_error = float(argv[4]) + self.space_warn = float(argv[5]) + self.space_error = float(argv[6]) self.is_root = os.geteuid() == 0 except: - print("Usage: %s return_value $COLUMNS last_refresh load_warn load_error space_warn space_error") + print("Usage: %s $COLUMNS last_refresh_time load_warn load_error space_warn space_error") print(" e.g. %s 1 $COLUMNS 25 1.25 2.5 0.15 0.05") print() @@ -404,8 +403,8 @@ class StatsPart(Part): self.fragments.append(style_bold()) # delta - if settings.last_refresh: - then = datetime.datetime.fromtimestamp(settings.last_refresh).replace(hour=0, minute=0, second=0, microsecond=0) + if settings.last_refresh_time: + then = datetime.datetime.fromtimestamp(settings.last_refresh_time).replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) midnights = (now - then).days diff --git a/share/zsh-init b/share/zsh-init index 8fccb14..bab06e5 100755 --- a/share/zsh-init +++ b/share/zsh-init @@ -21,7 +21,7 @@ function preexec { function precmd { set_title "${PWD}" - python3 /usr/libexec/over-prompt.py $? "${COLUMNS}" "${OVER_PROMPT_LAST_REFRESH}" "${OVER_PROMPT_SYSLOAD_WARN:=1.25}" "${OVER_PROMPT_SYSLOAD_YELL:=2.5}" "${OVER_PROMPT_FREESPACE_WARN:=0.15}" "${OVER_PROMPT_FREESPACE_YELL:=0.05}" + python3 /usr/libexec/over-prompt.py "${COLUMNS}" "${OVER_PROMPT_LAST_REFRESH}" "${OVER_PROMPT_SYSLOAD_WARN:=1.25}" "${OVER_PROMPT_SYSLOAD_YELL:=2.5}" "${OVER_PROMPT_FREESPACE_WARN:=0.15}" "${OVER_PROMPT_FREESPACE_YELL:=0.05}" PS1="$(print "%(?.%{\e[1;36m%}.%{\e[1;31m%}%?%{\e[0m%}:%{\e[1;31m%})%(\!.#.$)%{\e[0m%} ")" OVER_PROMPT_LAST_REFRESH=$(date +%s) }