Fix shared directory detection

install.sh

@@ -6,7 +6,7 @@ SHAREDIR="${PREFIX}/share/yms"
 BINDIR="${PREFIX}/bin"
 DESKTOPDIR="${PREFIX}/share/applications"
 ICONDIR="${PREFIX}/share/icons/hicolor"
-DOCDIR="${PREFIX}/share/doc"
+DOCDIR="${PREFIX}/share/doc/yms"
 LOCALEDIR="${PREFIX}/share/locale"
 
 SOURCEDIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
@@ -23,6 +23,7 @@ if [ "$(id -u)" -ne 0 ]; then
 fi
 
 echo "Installing Python application..."
+install -d "${LIBDIR}"
 
 # Main program
 install -m 0644 \
@@ -36,6 +37,8 @@ cp -a "${SOURCEDIR}/yms/." "${LIBDIR}/yms/"
 rm -rf "${LIBDIR}/yms/ui"
 
 # Static resources
+install -d "${SHAREDIR}"
+install -d "${SHAREDIR}/ui"
 install -m 0644 \
     "${SOURCEDIR}/yms/ui/main.ui" \
     "${SHAREDIR}/ui/main.ui"
@@ -68,13 +71,13 @@ install -d "${ICONDIR}/scalable/apps"
 install -d "${ICONDIR}/48x48/apps"
 install -d "${ICONDIR}/64x64/apps"
 install -m 0644 \
-    "${SOURCEDIR}/yms.svg" \
+    "${SOURCEDIR}/icons/yms.svg" \
     "${ICONDIR}/yms.svg"
 install -m 0644 \
-    "${SOURCEDIR}/yms-48.png" \
+    "${SOURCEDIR}/icons/yms48.png" \
     "${ICONDIR}/48x48/apps/yms.png"
 install -m 0644 \
-    "${SOURCEDIR}/yms-64.png" \
+    "${SOURCEDIR}/icons/yms64.png" \
     "${ICONDIR}/64x64/apps/yms.png"
 
 echo "Installing launcher..."
@@ -85,6 +88,7 @@ EOF
 chmod 0755 "${BINDIR}/yms"
 
 echo "Installing desktop entry..."
+install -d "${DESKTOPDIR}"
 install -m 0644 \
     "${SOURCEDIR}/yms.desktop" \
     "${DESKTOPDIR}/yms.desktop"

ymsgui.py

@@ -56,7 +56,7 @@ def get_share_dir():
 class Frontend():
 
     def __init__(self):
-        self.uipath = os.path.join(get_share_dir(), "yms", "ui")
+        self.uipath = os.path.join(get_share_dir(), "ui")
         builder = Gtk.Builder()
         builder.add_from_file(os.path.join(self.uipath, "main.ui"))
         builder.connect_signals(self)
@@ -90,7 +90,8 @@ class Frontend():
 
         # load shape of vessel if available
         handle = Rsvg.Handle()
-        self._svg = handle.new_from_file(os.path.join(sys.path[0], cfg['shapedir'], "elizabethan29.svg"))
+        self._svg = handle.new_from_file(os.path.join(get_share_dir(), "shapes", "elizabethan29.svg"))
+        #self._svg = handle.new_from_file(os.path.join(sys.path[0], cfg['shapedir'], "elizabethan29.svg"))
         #viewport = Rsvg.Rectangle()
         #viewport.x = 0
         #viewport.y = 0