Merge pull request #25 from opendesktop/develop

Develop

.travis.yml

@@ -10,7 +10,5 @@ branches:
 
 script:
   - mntdir='/mnt/ocs-manager'
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
   - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
   - cat transfer.log

app/configs/application.json

 {
     "id": "ocs-manager",
     "name": "ocs-manager",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "organization": "Opendesktop.org",
     "domain": "org.opendesktop.ocs-manager",
     "icon": ":/desktop/ocs-manager.svg",

app/src/websockets/websocketserver.cpp

@@ -55,6 +55,10 @@ WebSocketServer::~WebSocketServer()
 bool WebSocketServer::start()
 {
     if (wsServer_->listen(QHostAddress::Any, serverPort_)) {
+        auto application = configHandler_->getUsrConfigApplication();
+        application["websocket_url"] = serverUrl().toString();
+        configHandler_->setUsrConfigApplication(application);
+
         emit started();
         return true;
     }
@@ -63,6 +67,10 @@ bool WebSocketServer::start()
 
 void WebSocketServer::stop()
 {
+    auto application = configHandler_->getUsrConfigApplication();
+    application["websocket_url"] = QString("");
+    configHandler_->setUsrConfigApplication(application);
+
     wsServer_->close();
 }
 

pkg/appimage/appimage.sh

 #!/bin/sh
 
 PKGNAME='ocs-manager'
-PKGVER='0.5.3'
+PKGVER='0.5.4'
 PKGREL='1'
 
 curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"

scripts/build-docker.sh

@@ -25,14 +25,6 @@ transfer_file() {
     fi
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     # docker-image: ubuntu:14.04
 
@@ -63,13 +55,21 @@ build_appimage() {
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi

scripts/build.sh

@@ -20,14 +20,6 @@ export_srcarchive() {
     $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     cd "${PROJDIR}"
     mkdir -p "${BUILDDIR}"
@@ -39,13 +31,21 @@ build_appimage() {
     sh appimage.sh
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi