From 1c0f68a179c2a2d32c24837a4ac90621f4ca9804 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageia.org>
Date: Sat, 31 Mar 2018 09:04:07 +0200
Subject: Adjust installing process

---
 Makefile  | 19 +++++++++----------
 isodumper | 25 +++++++++----------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 95b9d01..a5596b3 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 PREFIX=/usr
 BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
-LIBDIR=$(PREFIX)/lib
+LIBDIR=$(PREFIX)/lib/python3.5/site-packages
 LIBEXECDIR=$(PREFIX)/libexec
 POLKITPOLICYDIR=$(PREFIX)/share/polkit-1/actions
 DATADIR=$(PREFIX)/share
@@ -53,14 +53,13 @@ clean:
 
 install:
 
-	# for binary file script isodumper on /usr/libexec/
-	mkdir -p $(DESTDIR)$(LIBEXECDIR)
-	install -m 755 isodumper $(DESTDIR)$(LIBEXECDIR)
+	# for binary file script isodumper on /usr/bin
+	install -m 755 isodumper $(DESTDIR)$(BINDIR)
 
 	# for binary file isodumper on /usr/bin/ 
 	# to have authentication with polkit (use for mageia policy)
-	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 755 polkit/isodumper $(DESTDIR)$(BINDIR)
+	#mkdir -p $(DESTDIR)$(BINDIR)
+	#install -m 755 polkit/isodumper $(DESTDIR)$(BINDIR)
 
 	# for backend magiback listening DBus on /usr/bin/ 
 	install -m 755 backend/magiback $(DESTDIR)$(BINDIR)
@@ -82,11 +81,11 @@ install:
 	mkdir -p $(DESTDIR)$(LIBDIR)/isodumper
 	install -m 755 lib/isodumper.py $(DESTDIR)$(LIBDIR)/isodumper
 	install -m 755 lib/raw_format.py $(DESTDIR)$(LIBDIR)/isodumper
-	install -m 755 lib/raw_write.py $(DESTDIR)$(LIBDIR)/isodumper
+	install -m 755 backend/raw_write.py $(DESTDIR)$(LIBDIR)/isodumper
 
-	# for manatools mpan file in /etc/manatools/mpan/categories.conf.d/
-	mkdir -p $(DESTDIR)$(SYSCONFDIR)/manatools/mpan/categories.conf.d
-	install -m 644 mpan/categories.conf.d/isodumper.conf $(DESTDIR)$(SYSCONFDIR)/manatools/mpan/categories.conf.d
+	# for manatools mpan file in /etc/mpan/categories.conf.d/
+	mkdir -p $(DESTDIR)$(SYSCONFDIR)/mpan/categories.conf.d
+	install -m 644 mpan/categories.conf.d/isodumper.conf $(DESTDIR)$(SYSCONFDIR)/mpan/categories.conf.d/isodumper.conf
 
 	# for DATADIR isodumper.py header.png and header.svg
 	mkdir -p $(DESTDIR)$(DATADIR)/isodumper
diff --git a/isodumper b/isodumper
index b9a21a6..df1b890 100755
--- a/isodumper
+++ b/isodumper
@@ -1,16 +1,9 @@
-#!/bin/sh
-#
-
-# Copyright (C) 2013 THE isodumper'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the isodumper package.
-
-# Author isodumper software= papoteur <papoteur@mageialinux-online.org>
-# Author binary file= Geiger David <david.david@mageialinux-online.org>
-
-set -e
-
-TERM=xterm
-
-DIR=/usr/lib/isodumper
-
-python3 $DIR/isodumper.py
+#!/usr/bin/python3
+from isodumper import isodumper
+import yui
+
+app = isodumper.IsoDumper()
+app.run()
+# next line seems to be a workaround to prevent the qt-app from crashing
+# see https://github.com/libyui/libyui-qt/issues/41
+yui.YUILoader.deleteUI()
-- 
cgit v1.2.1