From 529a39d3fb2e60cef789307ef77396ba4d89cec5 Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Sun, 7 Jun 2020 04:46:04 +0000 Subject: [PATCH] Smoketesting AWS Linux install/uninstall/upgrade actions --- pkg-scripts/make-rpm-server | 2 ++ pkg-scripts/server-postinst | 4 ++-- pkg-scripts/vircadia-server.spec | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg-scripts/make-rpm-server b/pkg-scripts/make-rpm-server index 57231e4f55..20ac76d4b0 100755 --- a/pkg-scripts/make-rpm-server +++ b/pkg-scripts/make-rpm-server @@ -16,6 +16,7 @@ SOFILES=`ls \ $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* \ + $VIRCADIA/qt5-install/lib/libQt5Quick.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* \ | sed 's/\./\\\./g' \ | paste -d'|' -s` @@ -32,6 +33,7 @@ DEPENDS=mesa-libGL,`ls \ $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* \ + $VIRCADIA/qt5-install/lib/libQt5Quick.so.*.*.* \ $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* \ $VIRCADIA/build/assignment-client/plugins/*.so \ $VIRCADIA/build/assignment-client/plugins/*/*.so \ diff --git a/pkg-scripts/server-postinst b/pkg-scripts/server-postinst index ad7389aa2c..cb06adbae0 100755 --- a/pkg-scripts/server-postinst +++ b/pkg-scripts/server-postinst @@ -43,8 +43,8 @@ case "$1" in cp /etc/opt/athena/* /etc/opt/vircadia cp -R /var/lib/athena/* /var/lib/vircadia chown -R vircadia:vircadia /var/lib/vircadia/* - find /var/lib/athena -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. "Vircadia - dev"' ';' - find /var/lib/athena -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. Vircadia' ';' + find /var/lib/vircadia -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. "Vircadia - dev"' ';' + find /var/lib/vircadia -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. Vircadia' ';' VIRCADIA_ACTIVE=`echo -n $ATHENA_ACTIVE | sed 's/athena/vircadia/g'` VIRCADIA_ENABLED=`echo -n $ATHENA_ENABLED | sed 's/athena/vircadia/g'` diff --git a/pkg-scripts/vircadia-server.spec b/pkg-scripts/vircadia-server.spec index 61e87ee333..3e0eed896e 100644 --- a/pkg-scripts/vircadia-server.spec +++ b/pkg-scripts/vircadia-server.spec @@ -50,6 +50,7 @@ install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/li install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/libQt5Script.so.*.*.* install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/libQt5WebSockets.so.*.*.* install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/libQt5Qml.so.*.*.* +install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/libQt5Quick.so.*.*.* install -m 0644 -t $RPM_BUILD_ROOT/opt/vircadia/lib $VIRCADIA/qt5-install/lib/libQt5ScriptTools.so.*.*.* install -d $RPM_BUILD_ROOT/usr/lib/systemd/system install -m 0644 -t $RPM_BUILD_ROOT/usr/lib/systemd/system $VIRCADIA/source/pkg-scripts/vircadia-assignment-client.service @@ -117,8 +118,8 @@ if [ ! -d "/var/lib/vircadia/default" ]; then cp /etc/opt/athena/* /etc/opt/vircadia cp -R /var/lib/athena/* /var/lib/vircadia chown -R vircadia:vircadia /var/lib/vircadia/* - find /var/lib/athena -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. "Vircadia - dev"' ';' - find /var/lib/athena -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. Vircadia' ';' + find /var/lib/vircadia -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. "Vircadia - dev"' ';' + find /var/lib/vircadia -maxdepth 3 -path "*\.local/share" -execdir sh -c 'cd share; ln -s ../.. Vircadia' ';' VIRCADIA_ACTIVE=`echo -n $ATHENA_ACTIVE | sed 's/athena/vircadia/g'` VIRCADIA_ENABLED=`echo -n $ATHENA_ENABLED | sed 's/athena/vircadia/g'`