Fix configure hook

snap/snapcraft.yaml

@@ -103,15 +103,13 @@ parts:
         make distclean
       fi
 
+      INSTALL_PATH="${HOME}"
       if [ ! -z ${container+x} ]; then
-        OZW_LIB_PATH="$(dirname $(find /build/open-zwave/install -name libopenzwave.so -print0 -quit))"
-        OZW_INCLUDE_PATH="$(dirname $(find /build/parts/open-zwave/install -name Manager.h -print0 -quit))"
-        OZW_DATABASE_PATH="$(dirname $(find /build/parts/open-zwave/install -name manufacturer_specific.xml))"
-      else
-        OZW_LIB_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name libopenzwave.so -print0 -quit))"
-        OZW_INCLUDE_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name Manager.h -print0 -quit))"
-        OZW_DATABASE_PATH="$(dirname $(find $HOME/parts/open-zwave/install -name manufacturer_specific.xml))"
+        INSTALL_PATH="/build/${SNAPCRAFT_PROJECT_NAME}"
       fi
+      OZW_LIB_PATH="$(dirname $(find ${INSTALL_PATH}/parts/open-zwave/install -name libopenzwave.so -print0 -quit))"
+      OZW_INCLUDE_PATH="$(dirname $(find ${INSTALL_PATH}/parts/open-zwave/install -name Manager.h -print0 -quit))"
+      OZW_DATABASE_PATH="$(dirname $(find ${INSTALL_PATH}/parts/open-zwave/install -name manufacturer_specific.xml))"
       qmake -r "CONFIG+=release" \
           OZW_LIB_PATH="${OZW_LIB_PATH}" \
           OZW_INCLUDE_PATH="${OZW_INCLUDE_PATH}" \

src/hooks/configure

@@ -3,4 +3,7 @@
 set -e
 # silence is golden.
 
-snapctl restart "${SNAP_NAME}"
+RUNNING=$(snapctl services | grep "${SNAP_NAME}" | wc -l)
+if [ ${RUNNING} -gt 0 ]; then
+    snapctl restart "${SNAP_NAME}"
+fi