diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2018-11-03 20:00:07 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-11-27 22:48:43 +1000 |
| commit | 926eb345c26690ca93b6483ac949612c9b53e9db (patch) | |
| tree | 9980f4f4b0fe3898e22095e4dd706a6724a7da38 | |
| parent | c41222837d76d550921a70dd95c509537031102c (diff) | |
| download | pacman-926eb345c26690ca93b6483ac949612c9b53e9db.tar.xz | |
buildsys: remove size_to_human
This was only ever used by paccache, and paccache has since been moved
to pacman-contrib.
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/library/README | 4 | ||||
| -rw-r--r-- | scripts/library/size_to_human.sh | 22 | ||||
| -rw-r--r-- | scripts/meson.build | 1 | ||||
| -rw-r--r-- | scripts/po/POTFILES.in | 1 |
5 files changed, 1 insertions, 30 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c6b6220e..26c2e10d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,8 +35,7 @@ EXTRA_DIST = \ $(LIBMAKEPKG_DIST) LIBRARY = \ - library/human_to_size.sh \ - library/size_to_human.sh + library/human_to_size.sh libmakepkgdir = $(datarootdir)/makepkg diff --git a/scripts/library/README b/scripts/library/README index 2b3a97bc..b99b0bc8 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -8,7 +8,3 @@ successful, the converted byte value is written to stdout and the function returns 0. If an error occurs, nothing in written and the function returns 1. Results may be inaccurate when using a broken implementation of awk, such as mawk or busybox awk. - -size_to_human.sh: -The reverse of human_to_size, this function takes an integer byte size and -prints its in human readable format, with SI prefixes (e.g. MiB, TiB). diff --git a/scripts/library/size_to_human.sh b/scripts/library/size_to_human.sh deleted file mode 100644 index 1d13eeb4..00000000 --- a/scripts/library/size_to_human.sh +++ /dev/null @@ -1,22 +0,0 @@ -size_to_human() { - awk -v size="$1" ' - BEGIN { - suffix[1] = "B" - suffix[2] = "KiB" - suffix[3] = "MiB" - suffix[4] = "GiB" - suffix[5] = "TiB" - suffix[6] = "PiB" - suffix[7] = "EiB" - count = 1 - - while (size > 1024) { - size /= 1024 - count++ - } - - sizestr = sprintf("%.2f", size) - sub(/\.?0+$/, "", sizestr) - printf("%s %s", sizestr, suffix[count]) - }' -} diff --git a/scripts/meson.build b/scripts/meson.build index 50b0c34f..aece7a22 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -12,7 +12,6 @@ scripts = [ library_files = [ 'library/human_to_size.sh', - 'library/size_to_human.sh', ] SCRIPT_EDITOR = find_program(configure_file( diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 37afc3b2..25eb9d3f 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -67,4 +67,3 @@ scripts/libmakepkg/util/pkgbuild.sh.in scripts/libmakepkg/util/source.sh.in scripts/libmakepkg/util/util.sh.in scripts/library/human_to_size.sh -scripts/library/size_to_human.sh |