Dockerfile, RPM, and setup.py changes to match directory rename
diff --git a/Dockerfile b/Dockerfile
index 9000b6b..09a5eb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,7 +85,7 @@
RUN ln -s /usr/local/share/phantomjs/bin/phantomjs /bin/phantomjs
# Get XOS
-ADD planetstack /opt/xos
+ADD xos /opt/xos
ADD observer-initscript /etc/init.d/plstackobserver
diff --git a/setup.py b/setup.py
index 6f26f79..1162279 100644
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,9 @@
setup(name='planetstack',
version='0.1',
description='PlanetStack',
- scripts=['planetstack/xos-observer.py'],
+ scripts=['xos/xos-observer.py'],
data_files=[
- ('/lib/systemd/system/', ['planetstack/redhat/xos-observer.service']),
+ ('/lib/systemd/system/', ['xos/redhat/xos-observer.service']),
])
-copytree('planetstack/', '/opt/xos')
+copytree('xos/', '/opt/xos')
diff --git a/xos.spec b/xos.spec
index 0eaf919..91d60a2 100644
--- a/xos.spec
+++ b/xos.spec
@@ -88,9 +88,7 @@
rm -rf %{buildroot}/opt/xos
# don't copy symbolic links (they are handled in %post)
-rsync -rptgoD ./planetstack %{buildroot}/opt/.
-# XXX temporary - rename /opt/planetstack to /opt/xos
-mv %{buildroot}/opt/planetstack %{buildroot}/opt/xos
+rsync -rptgoD ./xos %{buildroot}/opt/.
cp observer-initscript %{buildroot}/etc/init.d/plstackobserver
find %{buildroot}/opt/xos -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" > %{_tmppath}/tmp-filelist