From 706fe0011f1949451f1646b113fc44c9f3b486da Mon Sep 17 00:00:00 2001
From: Tobi Sim <dasimmet@SimmetHome.fritz.box>
Date: Sat, 21 Feb 2015 15:59:41 +0100
Subject: [PATCH] Compatibility fixes

---
 Makefile                    |  30 +++++++++++++++++-------------
 dat/sailfish-python.desktop |   4 ++--
 renamep.py                  |  17 +++++++++++------
 sailfish-python-noarch.rpm  | Bin 10344 -> 0 bytes
 4 files changed, 30 insertions(+), 21 deletions(-)
 delete mode 100644 sailfish-python-noarch.rpm

diff --git a/Makefile b/Makefile
index 9a242f4..224162b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-Appname:=sailfish-python
+Appname:=$(shell cat appname.txt)
 prefix:=/usr
-temp:=/tmp/make
+temp:=/tmp/fpm
 builddir:=./build
 sdkpath:=$(HOME)/SailfishOS
 dependencies:=-d libsailfishapp-launcher -d python3-base -d pyotherside-qml-plugin-python3-qt5
@@ -12,7 +12,7 @@ jolla_wifi_ip:=Jolla
 
 all: clean build-tmp rpm-virt rpm-jolla
 
-make-jolla: build-tmp rpm-jolla send-jolla
+make-jolla-usb: build-tmp rpm-jolla send-jolla
 make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi
 make-jolla-ap: build-tmp rpm-jolla send-jolla-ap
 make-virt: build-tmp rpm-virt send-virt
@@ -30,32 +30,36 @@ build-tmp:
 	install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
 
 rpm-virt:
-	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(Appname)-$(arch).rpm -n $(Appname) -a $(arch) --prefix / *
+	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
 
 rpm-jolla: arch:=noarch
 rpm-jolla:
-	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(Appname)-$(arch).rpm -n $(Appname) -a $(arch) --prefix / *
+	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
 
 send-virt:
-	rsync -vrp --rsh='ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' ./$(Appname)-$(arch).rpm root@localhost:/home/nemo/Downloads
-	ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost pkcon install-local -y /home/nemo/Downloads/$(Appname)-$(arch).rpm
+	rsync -vrp --rsh='ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' ./$(rpmname) root@localhost:/tmp
+	ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
 	
 send-jolla-wifi: arch:=noarch
 send-jolla-wifi:
-	rsync -vrp ./$(Appname)-$(arch).rpm root@$(jolla_wifi_ip):/home/nemo/Downloads
-	ssh root@$(jolla_wifi_ip) pkcon install-local -y /home/nemo/Downloads/$(Appname)-$(arch).rpm
+	rsync -vrp ./$(rpmname) root@$(jolla_wifi_ip):/tmp
+	ssh root@$(jolla_wifi_ip) pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+
 send-jolla-ap: arch:=noarch 
 send-jolla-ap: jolla_wifi_ip:=192.168.1.1
 send-jolla-ap:
-	rsync -vrp ./$(Appname)-$(arch).rpm root@$(jolla_wifi_ip):/home/nemo/Downloads
-	ssh root@$(jolla_wifi_ip) pkcon install-local -y /home/nemo/Downloads/$(Appname)-$(arch).rpm
+	rsync -vrp ./$(rpmname) root@$(jolla_wifi_ip):/tmp
+	ssh root@$(jolla_wifi_ip) pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+
 send-jolla: arch:=noarch
 send-jolla:
-	rsync -vrp ./$(Appname)-$(arch).rpm root@$(jolla_usb_ip):/home/nemo/Downloads
-	ssh root@$(jolla_usb_ip) pkcon install-local -y /home/nemo/Downloads/$(Appname)-$(arch).rpm
+	rsync -vrp ./$(Appname)-$(arch).rpm root@$(jolla_usb_ip):/tmp
+	ssh root@$(jolla_usb_ip) pkcon install-local -y /tmp/$(Appname)-$(arch).rpm "&&" rm /tmp/$(Appname)-$(arch).rpm
+
 
 clean: 
 	rm -rf $(temp)
 	rm -rf $(builddir)
+	rm -rf ./$(rpmname)
 
 
diff --git a/dat/sailfish-python.desktop b/dat/sailfish-python.desktop
index 6304c03..f127049 100644
--- a/dat/sailfish-python.desktop
+++ b/dat/sailfish-python.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
 X-Nemo-Application-Type=silica-qt5
-Name=Scanner
+Name=sailfish-python
 Icon=icon-launcher-component-gallery
-Exec=sailfish-qml sailfish-scanner
+Exec=sailfish-qml sailfish-python
diff --git a/renamep.py b/renamep.py
index 6c9217a..efbddcb 100755
--- a/renamep.py
+++ b/renamep.py
@@ -14,12 +14,17 @@ os.rename("./qml/"+oldname+".qml","./qml/"+newname+".qml")
 os.rename("./dat/"+oldname+".desktop","./dat/"+newname+".desktop")
 os.rename("./dat/"+oldname+".sh","./dat/"+newname+".sh")
 
-makefile=open("./Makefile","r")
-maketxt=makefile.read()
-makefile.close()
-makefile=open("./Makefile","w")
-makefile.write(re.sub("Appname:="+oldname,"Appname:="+newname,maketxt))
-makefile.close()
+def replaceInFile(oldname,newname,filename):
+    makefile=open(filename,"r")
+    maketxt=makefile.read()
+    makefile.close()
+    makefile=open(filename,"w")
+    makefile.write(re.sub("Appname:="+oldname,"Appname:="+newname,maketxt))
+    makefile.close()
+
+for filename in ["./Makefile","./dat/"+newname+".desktop"]:
+    replaceInFile(oldname,newname,filename)
+
 
 namefile=open("./appname.txt","w")
 namefile.write(newname+"\n")
diff --git a/sailfish-python-noarch.rpm b/sailfish-python-noarch.rpm
deleted file mode 100644
index 494f5942ea4de9635c2df162dd0ffb460bde67b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10344
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