From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 6 Feb 2021 19:45:44 +0000 (-0600)
Subject: version-cmd: copy to bup.cmd.version
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=89728da85cc76be31554ce98bdcf8982fdb23b34;p=bup.git

version-cmd: copy to bup.cmd.version

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/lib/bup/cmd/version.py b/lib/bup/cmd/version.py
new file mode 100755
index 0000000..fd725aa
--- /dev/null
+++ b/lib/bup/cmd/version.py
@@ -0,0 +1,52 @@
+#!/bin/sh
+"""": # -*-python-*-
+# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
+export "BUP_ARGV_0"="$0"
+arg_i=1
+for arg in "$@"; do
+    export "BUP_ARGV_${arg_i}"="$arg"
+    shift
+    arg_i=$((arg_i + 1))
+done
+# Here to end of preamble replaced during install
+bup_python="$(dirname "$0")/../../../config/bin/python" || exit $?
+exec "$bup_python" "$0"
+"""
+# end of bup preamble
+
+from __future__ import absolute_import, print_function
+
+# Intentionally replace the dirname "$0" that python prepends
+import os, sys
+sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/../..'
+
+import re
+
+from bup import compat, options, version
+from bup.io import byte_stream
+
+version_rx = re.compile(r'^[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9]+-g[0-9abcdef]+)?$')
+
+optspec = """
+bup version [--date|--commit]
+--
+date    display the date this version of bup was created
+commit  display the git commit id of this version of bup
+"""
+o = options.Options(optspec)
+opt, flags, extra = o.parse(compat.argv[1:])
+
+
+total = (opt.date or 0) + (opt.commit or 0)
+if total > 1:
+    o.fatal('at most one option expected')
+
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
+
+if opt.date:
+    out.write(version.date.split(b' ')[0] + b'\n')
+elif opt.commit:
+    out.write(version.commit + b'\n')
+else:
+    out.write(version.version + b'\n')
diff --git a/lib/cmd/version-cmd.py b/lib/cmd/version-cmd.py
deleted file mode 100755
index d406712..0000000
--- a/lib/cmd/version-cmd.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-"""": # -*-python-*-
-# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
-export "BUP_ARGV_0"="$0"
-arg_i=1
-for arg in "$@"; do
-    export "BUP_ARGV_${arg_i}"="$arg"
-    shift
-    arg_i=$((arg_i + 1))
-done
-# Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
-exec "$bup_python" "$0"
-"""
-# end of bup preamble
-
-from __future__ import absolute_import, print_function
-
-# Intentionally replace the dirname "$0" that python prepends
-import os, sys
-sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/..'
-
-import re
-
-from bup import compat, options, version
-from bup.io import byte_stream
-
-version_rx = re.compile(r'^[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9]+-g[0-9abcdef]+)?$')
-
-optspec = """
-bup version [--date|--commit]
---
-date    display the date this version of bup was created
-commit  display the git commit id of this version of bup
-"""
-o = options.Options(optspec)
-opt, flags, extra = o.parse(compat.argv[1:])
-
-
-total = (opt.date or 0) + (opt.commit or 0)
-if total > 1:
-    o.fatal('at most one option expected')
-
-sys.stdout.flush()
-out = byte_stream(sys.stdout)
-
-if opt.date:
-    out.write(version.date.split(b' ')[0] + b'\n')
-elif opt.commit:
-    out.write(version.commit + b'\n')
-else:
-    out.write(version.version + b'\n')