diff options
Diffstat (limited to 'sysutils/discus/files')
-rw-r--r-- | sysutils/discus/files/patch-README.md | 4 | ||||
-rw-r--r-- | sysutils/discus/files/patch-discus.py | 27 | ||||
-rw-r--r-- | sysutils/discus/files/patch-discusrc | 6 |
3 files changed, 10 insertions, 27 deletions
diff --git a/sysutils/discus/files/patch-README.md b/sysutils/discus/files/patch-README.md index 9a2ff6a32508..3846c1102f0c 100644 --- a/sysutils/discus/files/patch-README.md +++ b/sysutils/discus/files/patch-README.md @@ -1,4 +1,4 @@ ---- README.md.orig 2021-04-26 14:05:27 UTC +--- README.md.orig 2023-01-15 08:07:06 UTC +++ README.md @@ -11,9 +11,9 @@ Features include color, bar graphs, and smart formatti gigabytes, or terabytes). Or choose your own size, along with specifying the @@ -33,4 +33,4 @@ +make install; make clean ``` - ## Test + ## Development diff --git a/sysutils/discus/files/patch-discus.py b/sysutils/discus/files/patch-discus.py index 9c9051e4efc6..81d613d89e0c 100644 --- a/sysutils/discus/files/patch-discus.py +++ b/sysutils/discus/files/patch-discus.py @@ -1,6 +1,6 @@ ---- discus.py.orig 2020-04-13 07:05:40 UTC +--- discus.py.orig 2023-01-21 12:38:18 UTC +++ discus.py -@@ -437,16 +437,8 @@ def read_mounts(mtab, skip_list): +@@ -350,16 +350,8 @@ def read_mounts(mtab, skip_list): """Read the mounts file.""" mounts = [] @@ -19,29 +19,12 @@ # Extract the mounted filesystems from the read file. for entry in mtab: -@@ -534,7 +526,7 @@ def get_layout(headers, reports): - def main(): +@@ -432,7 +424,7 @@ def main(): """Define main program.""" - parse_options() + options = parse_options() + interpret_options(options) - mounts = read_mounts(opts["mtab"], opts["skip_list"]) + mounts = read_mounts(None, opts["skip_list"]) headers = get_header(opts["graph"]) stats_factory = StatsFactory(opts["reserved"]) size_formatter = SizeFormatter(opts["smart"], opts["placing"], -@@ -559,13 +551,13 @@ def main(): - - if __name__ == "__main__": - # Before starting, we need to load the configuration files which -- # contain global objects. First the global /etc file, then the user's -+ # contain global objects. First the global /usr/local/etc file, then the user's - # file, if exists. - try: -- exec(compile(open("/etc/discusrc", "rb").read(), "/etc/discusrc", -+ exec(compile(open("/usr/local/etc/discus/discusrc", "rb").read(), "/usr/local/etc/discus/discusrc", - 'exec')) - except IOError: -- usage(EX_CONFIG, "/etc/discusrc must exist and be readable.") -+ usage(EX_CONFIG, "/usr/local/etc/discus/discusrc must exist and be readable.") - - try: - exec(compile(open(os.environ['HOME'] + "/.discusrc", "rb").read(), diff --git a/sysutils/discus/files/patch-discusrc b/sysutils/discus/files/patch-discusrc index 74647e6e275b..130a532aa37f 100644 --- a/sysutils/discus/files/patch-discusrc +++ b/sysutils/discus/files/patch-discusrc @@ -1,6 +1,6 @@ ---- discusrc.orig 2021-04-27 15:52:50 UTC +--- discusrc.orig 2023-01-15 08:07:06 UTC +++ discusrc -@@ -17,11 +17,6 @@ opts["graph"] = 1 +@@ -19,11 +19,6 @@ opts["graph"] = 1 opts["graph_char"] = "*" opts["graph_fill"] = "-" @@ -12,7 +12,7 @@ ## Number of decimal places to display, same as -p opts["places"] = 1 -@@ -30,10 +25,6 @@ opts["skip_list"] = ["/dev/pts", "/proc", "/dev", "/pr +@@ -32,10 +27,6 @@ opts["skip_list"] = ["/dev/pts", "/proc", "/dev", "/pr ## Use smart formatting of numbers. opts["smart"] = 1 |