summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-04-07 16:02:20 -0400
committerSimo Sorce <simo@redhat.com>2014-04-11 17:25:54 -0400
commit904898b83d90d3d7f83c574b27a79b98a23e3734 (patch)
tree025cf4a31ff2f04f17729e59726270245a88c0db
parent98caa6ed5e8a67703d92ccd170fe1731642aa01e (diff)
downloadipsilon-904898b83d90d3d7f83c574b27a79b98a23e3734.tar.gz
ipsilon-904898b83d90d3d7f83c574b27a79b98a23e3734.tar.xz
ipsilon-904898b83d90d3d7f83c574b27a79b98a23e3734.zip
Rename scripts and mark them as such
Mark actual top level scripts as such instead of disguising them as modules. Also remove __init__.py from ipsilon/install as this is not a module just the place where install scripts are kept, for now. Note: Scripts are installed in the bin directory but the contrib spec file moves them to sbin. Signed-off-by: Simo Sorce <simo@redhat.com>
-rw-r--r--contrib/fedora/ipsilon.spec8
-rw-r--r--ipsilon/install/__init__.py0
-rwxr-xr-xipsilon/install/ipsilon-server-install (renamed from ipsilon/install/server.py)0
-rwxr-xr-xipsilon/ipsilon (renamed from ipsilon/idpserver.py)0
-rwxr-xr-xsetup.py6
5 files changed, 5 insertions, 9 deletions
diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index d5be793..cdce10d 100644
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -37,12 +37,8 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
mkdir -p %{buildroot}%{_sbindir}
install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon
install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon/sessions
-ln -s ../..%{python2_sitelib}/ipsilon/idpserver.py \
- %{buildroot}/%{_sbindir}/ipsilon
-chmod +x %{buildroot}%{python2_sitelib}/ipsilon/idpserver.py
-ln -s ../..%{python2_sitelib}/ipsilon/install/server.py \
- %{buildroot}/%{_sbindir}/ipsilon-server-install
-chmod +x %{buildroot}%{python2_sitelib}/ipsilon/install/server.py
+mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_sbindir}
+mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir}
install -d -m 0700 %{buildroot}%{_sysconfdir}/ipsilon
%pre
diff --git a/ipsilon/install/__init__.py b/ipsilon/install/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/ipsilon/install/__init__.py
+++ /dev/null
diff --git a/ipsilon/install/server.py b/ipsilon/install/ipsilon-server-install
index 4ae0c8f..4ae0c8f 100755
--- a/ipsilon/install/server.py
+++ b/ipsilon/install/ipsilon-server-install
diff --git a/ipsilon/idpserver.py b/ipsilon/ipsilon
index 9fa370e..9fa370e 100755
--- a/ipsilon/idpserver.py
+++ b/ipsilon/ipsilon
diff --git a/setup.py b/setup.py
index 7dd021d..846698b 100755
--- a/setup.py
+++ b/setup.py
@@ -27,8 +27,7 @@ setup(
version = '0.1',
license = 'GPLv3+',
packages = ['ipsilon', 'ipsilon.admin', 'ipsilon.login', 'ipsilon.util',
- 'ipsilon.providers', 'ipsilon.providers.saml2',
- 'ipsilon.install'],
+ 'ipsilon.providers', 'ipsilon.providers.saml2'],
data_files = [('share/man/man7', ["man/ipsilon.7"]),
('share/doc/ipsilon', ['COPYING']),
('share/doc/ipsilon/examples', ['examples/ipsilon.conf',
@@ -43,6 +42,7 @@ setup(
(DATA+'templates/install', glob('templates/install/*.conf')),
(DATA+'templates/admin/providers',
glob('templates/admin/providers/*.html')),
- ]
+ ],
+ scripts = ['ipsilon/ipsilon', 'ipsilon/install/ipsilon-server-install']
)