From 1e2f1cf3394afd1ee02cc47d115cf62f25f71a41 Mon Sep 17 00:00:00 2001
From: Heather Anderson <heath@odysseus.anderson.name>
Date: Wed, 29 Jan 2020 07:14:29 +0000
Subject: [PATCH] Additional tweaks and fixes to rpm packaging scripts

Renamed folder from /rpm to /pkg-scripts, in preparation for adding non-rpm packaging scripts
new-server scripts adjusted for new symlink name ("High Fidelity" renamed to "Project Athena")
---
 .../athena-assignment-client.service           |  0
 .../athena-assignment-client@.service          |  0
 .../athena-domain-server.service               |  0
 .../athena-domain-server@.service              |  0
 {rpm => pkg-scripts}/athena-ice-server.service |  0
 .../athena-ice-server@.service                 |  0
 {rpm => pkg-scripts}/athena-server.spec        | 18 +++++++++---------
 {rpm => pkg-scripts}/athena-server.target      |  0
 {rpm => pkg-scripts}/athena-server@.target     |  0
 {rpm => pkg-scripts}/new-server                |  2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename {rpm => pkg-scripts}/athena-assignment-client.service (100%)
 rename {rpm => pkg-scripts}/athena-assignment-client@.service (100%)
 rename {rpm => pkg-scripts}/athena-domain-server.service (100%)
 rename {rpm => pkg-scripts}/athena-domain-server@.service (100%)
 rename {rpm => pkg-scripts}/athena-ice-server.service (100%)
 rename {rpm => pkg-scripts}/athena-ice-server@.service (100%)
 rename {rpm => pkg-scripts}/athena-server.spec (90%)
 rename {rpm => pkg-scripts}/athena-server.target (100%)
 rename {rpm => pkg-scripts}/athena-server@.target (100%)
 rename {rpm => pkg-scripts}/new-server (96%)

diff --git a/rpm/athena-assignment-client.service b/pkg-scripts/athena-assignment-client.service
similarity index 100%
rename from rpm/athena-assignment-client.service
rename to pkg-scripts/athena-assignment-client.service
diff --git a/rpm/athena-assignment-client@.service b/pkg-scripts/athena-assignment-client@.service
similarity index 100%
rename from rpm/athena-assignment-client@.service
rename to pkg-scripts/athena-assignment-client@.service
diff --git a/rpm/athena-domain-server.service b/pkg-scripts/athena-domain-server.service
similarity index 100%
rename from rpm/athena-domain-server.service
rename to pkg-scripts/athena-domain-server.service
diff --git a/rpm/athena-domain-server@.service b/pkg-scripts/athena-domain-server@.service
similarity index 100%
rename from rpm/athena-domain-server@.service
rename to pkg-scripts/athena-domain-server@.service
diff --git a/rpm/athena-ice-server.service b/pkg-scripts/athena-ice-server.service
similarity index 100%
rename from rpm/athena-ice-server.service
rename to pkg-scripts/athena-ice-server.service
diff --git a/rpm/athena-ice-server@.service b/pkg-scripts/athena-ice-server@.service
similarity index 100%
rename from rpm/athena-ice-server@.service
rename to pkg-scripts/athena-ice-server@.service
diff --git a/rpm/athena-server.spec b/pkg-scripts/athena-server.spec
similarity index 90%
rename from rpm/athena-server.spec
rename to pkg-scripts/athena-server.spec
index f68b53d8ee..dcdbe49d44 100644
--- a/rpm/athena-server.spec
+++ b/pkg-scripts/athena-server.spec
@@ -29,7 +29,7 @@ Project Athena allows creation and sharing of VR experiences.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/athena
-install -m 0755 -t $RPM_BUILD_ROOT/etc/athena $ATHENA/source/rpm/new-server
+install -m 0755 -t $RPM_BUILD_ROOT/etc/athena $ATHENA/source/pkg-scripts/new-server
 install -d $RPM_BUILD_ROOT/usr/share/athena
 install -m 0755 $ATHENA/build/assignment-client/assignment-client $RPM_BUILD_ROOT/usr/share/athena
 install -m 0755 $ATHENA/build/domain-server/domain-server $RPM_BUILD_ROOT/usr/share/athena
@@ -39,14 +39,14 @@ install -d $RPM_BUILD_ROOT/usr/share/athena/lib
 install -m 0644 -t $RPM_BUILD_ROOT/usr/share/athena/lib $ATHENA/qt5-install/lib/*.so.*.*.*
 install -m 0644 -t $RPM_BUILD_ROOT/usr/share/athena/lib $ATHENA/build/ext/makefiles/quazip/project/lib/*.so.*.*.*
 install -d $RPM_BUILD_ROOT/usr/lib/systemd/system
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-assignment-client.service
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-assignment-client@.service
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-domain-server.service
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-domain-server@.service
-#install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-ice-server.service
-#install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-ice-server@.service
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-server.target
-install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/rpm/athena-server@.target
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-assignment-client.service
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-assignment-client@.service
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-domain-server.service
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-domain-server@.service
+#install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-ice-server.service
+#install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-ice-server@.service
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-server.target
+install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $ATHENA/source/pkg-scripts/athena-server@.target
 cp -a $ATHENA/source/domain-server/resources $RPM_BUILD_ROOT/usr/share/athena
 
 
diff --git a/rpm/athena-server.target b/pkg-scripts/athena-server.target
similarity index 100%
rename from rpm/athena-server.target
rename to pkg-scripts/athena-server.target
diff --git a/rpm/athena-server@.target b/pkg-scripts/athena-server@.target
similarity index 100%
rename from rpm/athena-server@.target
rename to pkg-scripts/athena-server@.target
diff --git a/rpm/new-server b/pkg-scripts/new-server
similarity index 96%
rename from rpm/new-server
rename to pkg-scripts/new-server
index d4553d80e7..2f34d6e3a4 100644
--- a/rpm/new-server
+++ b/pkg-scripts/new-server
@@ -28,7 +28,7 @@ if [ -d "/var/lib/athena/$1" ]; then
 fi
 
 mkdir -p /var/lib/athena/$1/.local/share
-ln -s ../.. /var/lib/athena/$1/.local/share/High\ Fidelity\ -\ dev
+ln -s ../.. /var/lib/athena/$1/.local/share/Project\ Athena\ -\ dev
 mkdir -p /var/lib/athena/$1/domain-server
 echo "{\"metaverse\": {\"local_port\": $(($2 + 2))},\"version\": 2.4}" > /var/lib/athena/$1/domain-server/config.json
 chown -R athena.athena /var/lib/athena/$1