From 234ad9d52a67845c977a1e70d7edd3452db20baa Mon Sep 17 00:00:00 2001
From: Tobi Sim <dasimmet@SimmetHome.fritz.box>
Date: Sun, 8 Mar 2015 18:38:02 +0100
Subject: [PATCH] fixes to various things

---
 Makefile               | 13 +++++++------
 README.md              |  2 +-
 dat/sailfish-python.sh |  2 +-
 renamep.py             |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c4e2c6c..186af37 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ arch:=noarch
 rpmname:=$(Appname)-$(arch).rpm
 jolla_usb_ip:=192.168.2.15
 jolla_wifi_ip:=Jolla
+jolla_ip:=$(jolla_usb_ip)
 
 
 all: clean build-tmp rpm-virt rpm-jolla
@@ -30,23 +31,23 @@ 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)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
+	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
 
 rpm-jolla:
-	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
+	cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
 
 send-virt:
-	cat ./$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+	cat $(temp)/$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
 	
 send-jolla-wifi:
-	cat ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+	cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
 
 send-jolla-ap: jolla_wifi_ip:=192.168.1.1
 send-jolla-ap:
-	cat ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+	cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
 
 send-jolla:
-	cat ./$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
+	cat $(temp)/$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
 
 clean: 
 	rm -rf $(temp)
diff --git a/README.md b/README.md
index fd6a899..fc16838 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ use these make commands to build/install your app for testing:
 
 builds your package, and installs it on your Sailfish Emulator on localhost:2223, considering your Sailfish-SDK is installed at ~/SailfishOS
 
-`make make-jolla-wifi`
+`make make-jolla-wifi [jolla_wifi_ip=jolla]`
 
 builds your package, and installs it on your jolla phone, considering your development PC is authorized for root ssh login on the phone and it is found in your dns-space as "jolla"
 
diff --git a/dat/sailfish-python.sh b/dat/sailfish-python.sh
index d3a80cf..4b872dc 100644
--- a/dat/sailfish-python.sh
+++ b/dat/sailfish-python.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-sailfish-qml sailfish-scanner
+sailfish-qml sailfish-python
 
diff --git a/renamep.py b/renamep.py
index 40ce95d..c5fb4d5 100755
--- a/renamep.py
+++ b/renamep.py
@@ -22,7 +22,7 @@ def replaceInFile(oldname,newname,filename):
     makefile.write(re.sub(oldname,newname,maketxt))
     makefile.close()
 
-for filename in ["./Makefile","./dat/"+newname+".desktop"]:
+for filename in ["./Makefile","./dat/"+newname+".desktop","./dat/"+newname+".sh"]:
     replaceInFile(oldname,newname,filename)