diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | libexec/container/version | 53 | ||||
| -rw-r--r-- | python3/compute_tools/__init__.py | 20 | ||||
| -rw-r--r-- | python3/compute_tools/container/__init__.py | 20 | ||||
| -rw-r--r-- | python3/compute_tools/container/version/__init__.py | 21 | ||||
| -rw-r--r-- | python3/compute_tools/container/version/functions.py | 27 | ||||
| -rw-r--r-- | python3/compute_tools/container/version/variables.py | 20 |
7 files changed, 142 insertions, 25 deletions
@@ -81,6 +81,9 @@ install: build mkdir -p $(DESTDIR)/usr/libexec cp -r libexec/* $(DESTDIR)/usr/libexec + mkdir -p $(DESTDIR)/usr/lib/python3/dist-packages + cp -r python3/* $(DESTDIR)/usr/lib/python3/dist-packages + mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE) cp -r VERSION.txt $(DESTDIR)/usr/share/$(SOFTWARE) cp -r share/config share/hooks share/keys share/build-scripts share/get-scripts $(DESTDIR)/usr/share/$(SOFTWARE) @@ -193,6 +196,9 @@ uninstall: rm -rf $(DESTDIR)/usr/share/$(SOFTWARE) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share || true + rm -rf $(DESTDIR)/usr/lib/python3/dist-packages/compute_tools + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/lib/python3/dist-packages + rm -rf $(DESTDIR)/usr/libexec/$(PROGRAM) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/libexec || true diff --git a/libexec/container/version b/libexec/container/version index 3b33a4d..3cb0df8 100755 --- a/libexec/container/version +++ b/libexec/container/version @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/python3 # Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> # @@ -17,33 +17,36 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -set -e +from sys import exit -PROJECT="open-infrastructure" -SOFTWARE="compute-tools" -PROGRAM="container" -COMMAND="$(basename ${0})" +import compute_tools.container as container -HOOKS="/etc/${SOFTWARE}/hooks" -SHARE="/usr/share/${SOFTWARE}" +def main(): + # run + container.print_version() + + exit(0) + +if __name__ == '__main__': + main() -# Pre hooks -for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}" -do - if [ -x "${FILE}" ] - then - "${FILE}" - fi -done -# Run -cat "${SHARE}/VERSION.txt" + + +# Pre hooks +#for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}" +#do +# if [ -x "${FILE}" ] +# then +# "${FILE}" +# fi +#done # Post hooks -for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" -do - if [ -x "${FILE}" ] - then - "${FILE}" - fi -done +#for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}" +#do +# if [ -x "${FILE}" ] +# then +# "${FILE}" +# fi +#done diff --git a/python3/compute_tools/__init__.py b/python3/compute_tools/__init__.py new file mode 100644 index 0000000..cdb0b06 --- /dev/null +++ b/python3/compute_tools/__init__.py @@ -0,0 +1,20 @@ +# Open Infrastructure: compute-tools + +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +from .container import * diff --git a/python3/compute_tools/container/__init__.py b/python3/compute_tools/container/__init__.py new file mode 100644 index 0000000..a23d067 --- /dev/null +++ b/python3/compute_tools/container/__init__.py @@ -0,0 +1,20 @@ +# Open Infrastructure: compute-tools + +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +from .version import * diff --git a/python3/compute_tools/container/version/__init__.py b/python3/compute_tools/container/version/__init__.py new file mode 100644 index 0000000..d2cebd6 --- /dev/null +++ b/python3/compute_tools/container/version/__init__.py @@ -0,0 +1,21 @@ +# Open Infrastructure: compute-tools + +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +from .functions import * +from .variables import * diff --git a/python3/compute_tools/container/version/functions.py b/python3/compute_tools/container/version/functions.py new file mode 100644 index 0000000..e20742a --- /dev/null +++ b/python3/compute_tools/container/version/functions.py @@ -0,0 +1,27 @@ +# Open Infrastructure: compute-tools + +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +from .variables import * + +def print_version(): + print('Open Infrastructure compute-tools' + ' ' + version) + print('Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>') + print('License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>') + print('This is free software: you are free to change and redistribute it.') + print('There is NO WARRANTY, to the extent permitted by law.') diff --git a/python3/compute_tools/container/version/variables.py b/python3/compute_tools/container/version/variables.py new file mode 100644 index 0000000..0db8333 --- /dev/null +++ b/python3/compute_tools/container/version/variables.py @@ -0,0 +1,20 @@ +# Open Infrastructure: compute-tools + +# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +version = '20210802' |