Remove release stuff and use directory detection to invoke py files f…

…rom sh files

README.md

@@ -1,5 +1,3 @@
--> **Clone with option --recurse-submodules to fetch submodules directly when cloning**
-
 This little personal project helps frame photos into frames of mockup rooms (mockup rooms not provided except small sample).
 You can use any mockup you want, portrait, square or landscape, and frame any photo you want to the right frames. The program will help you calibrate your mockups (to map where the frame is in the mockup room) and then assemble photos to them - it will automatically frame all landscape photos into landscape frame mockups, portraits into portrait frame mockups and square into square frame mockups.
 

frame.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
 # Just a wrapper for python
-python3 frame.py "$@"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+python3 "$DIR/frame.py" "$@"

test.py

@@ -15,10 +15,7 @@ def help(message = ""):
   print("\n"+message)
 
 def testMockup(mockuppath, framesize, framecoordinates, noask):
-  if getattr(sys, 'frozen', False):
-    application_path = os.path.dirname(os.path.abspath(sys.executable))
-  elif __file__:
-    application_path = os.path.dirname(os.path.abspath(__file__))
+  application_path = os.path.dirname(os.path.abspath(__file__))
 
   testfilepath = os.path.join(application_path,"imageformockuptest.jpg")
   print("Mockup file image for frame test: "+testfilepath)
@@ -38,7 +35,9 @@ def testMockup(mockuppath, framesize, framecoordinates, noask):
   # Add photo to frame at coordinates
   framed_im.paste(resizedphoto_im, framecoordinates)
   # Save result in working dir
-  framed_im.save(os.path.join(os.getcwd(), 'isItFramedOk.jpg'))
+  testresultfilename = 'isItFramedOk.jpg'
+  wheretosaveresultfile = os.getcwd()
+  framed_im.save(os.path.join(wheretosaveresultfile, testresultfilename))
 
   # Helper for frame name in case it's good
   print("If this result is good (meaning you dimensioned the frame correctly and the photo fits perfectly in it), you should rename the frame as follows in order to use it as a frame for kshhhactivate:")
@@ -60,6 +59,8 @@ def testMockup(mockuppath, framesize, framecoordinates, noask):
       os.rename(r''+mockuppath, r''+resultfile)
       print("File renamed, now ready to use with kshhhactivate.py")
 
+  print("\nCheck file "+testresultfilename+" at "+wheretosaveresultfile)
+
 
 def main(argv):
   # Look for options

test.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
 # Just a wrapper for python
-python3 test.py "$@"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+python3 "$DIR/test.py" "$@"