[node-patches] Change in ovirt-node[master]: package: Move TUI scripts to scripts/

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: package: Move TUI scripts to scripts/
......................................................................

package: Move TUI scripts to scripts/

The TUI is now located in the top-level src/ dir (as all other modules).

rhbz#843753

Change-Id: I053d7ee44914f840d51b464447e785d9db5ed473
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
M scripts/Makefile.am
R scripts/legacy/ovirt-config-installer.py
R scripts/legacy/ovirt-config-setup.py
R scripts/legacy/ovirt-config-storage
R scripts/ovirt-config-setup
R scripts/ovirt-node-doc
R scripts/ovirt-node-installer
R src/README.tui
D src/tui/TODO
M src/tui/setup.py
11 files changed, 13 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/00/14000/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 0018b5f..3dd74f1 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -357,6 +357,7 @@
 %{_libexecdir}/ovirt-config-setup
 %{_libexecdir}/ovirt-admin-shell
 %{_libexecdir}/ovirt-init-functions.sh
+%{_libexecdir}/ovirt-config-storage
 %{_sbindir}/persist
 %{_sbindir}/unpersist
 %{python_sitelib}/ovirt_config_setup
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 546dfad..f73f3a8 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,16 +25,22 @@
   persist \
   unpersist
 
+dist_bin_SCRIPTS = \
+  ovirt-config-setup \
+  ovirt-node-installer \
+  ovirt-node-doc
+
 dist_libexec_SCRIPTS = \
   ovirt-config-password \
   ovirt-config-uninstall \
   ovirt-functions \
   ovirt-rpmquery \
   ovirt-init-functions.sh \
-  ovirt-config-installer.py \
-  ovirt-config-setup.py \
   ovirt-auto-install.py \
-  ovirt-admin-shell
+  ovirt-admin-shell \
+  legacy/ovirt-config-installer.py \
+  legacy/ovirt-config-setup.py \
+  legacy/ovirt-config-storage
 
 # default hook for local_boot_trigger
 dist_localboottrigger_SCRIPTS = \
diff --git a/scripts/ovirt-config-installer.py b/scripts/legacy/ovirt-config-installer.py
similarity index 100%
rename from scripts/ovirt-config-installer.py
rename to scripts/legacy/ovirt-config-installer.py
diff --git a/scripts/ovirt-config-setup.py b/scripts/legacy/ovirt-config-setup.py
similarity index 100%
rename from scripts/ovirt-config-setup.py
rename to scripts/legacy/ovirt-config-setup.py
diff --git a/scripts/ovirt-config-storage b/scripts/legacy/ovirt-config-storage
similarity index 100%
rename from scripts/ovirt-config-storage
rename to scripts/legacy/ovirt-config-storage
diff --git a/src/tui/bin/ovirt-config-setup b/scripts/ovirt-config-setup
similarity index 100%
rename from src/tui/bin/ovirt-config-setup
rename to scripts/ovirt-config-setup
diff --git a/src/tui/bin/ovirt-node-doc b/scripts/ovirt-node-doc
similarity index 100%
rename from src/tui/bin/ovirt-node-doc
rename to scripts/ovirt-node-doc
diff --git a/src/tui/bin/ovirt-node-installer b/scripts/ovirt-node-installer
similarity index 100%
rename from src/tui/bin/ovirt-node-installer
rename to scripts/ovirt-node-installer
diff --git a/src/tui/README b/src/README.tui
similarity index 100%
rename from src/tui/README
rename to src/README.tui
diff --git a/src/tui/TODO b/src/tui/TODO
deleted file mode 100644
index 0f61745..0000000
--- a/src/tui/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Pull common functionality into NodePlugins (changes helper)
-- Improve List widget - It needs to have a scrollbar or display it's status in another way
-- Add CIM support and page
diff --git a/src/tui/setup.py b/src/tui/setup.py
index ccc6797..4f4a6e5 100644
--- a/src/tui/setup.py
+++ b/src/tui/setup.py
@@ -10,9 +10,9 @@
     url='http://www.ovirt.org/',
     license="GPLv2+",
     scripts=[
-             "bin/ovirt-config-setup",
-             "bin/ovirt-node-installer",
-             "bin/ovirt-node-doc"
+#             "bin/ovirt-config-setup",
+#             "bin/ovirt-node-installer",
+#             "bin/ovirt-node-doc"
              ],
     package_dir = {'': 'src'},
     packages=[


--
To view, visit http://gerrit.ovirt.org/14000
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I053d7ee44914f840d51b464447e785d9db5ed473
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>