From 131be3ccf012cbc758e4bcf77c70f9a45fe11dc4 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:58:32 +0200
Subject: [PATCH] Productivity: createScreen.sh: Fix subFolder parameter again

---
 Tools/Templates/README.md       |  6 +++---
 Tools/Templates/createScreen.sh | 22 ++++++----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Tools/Templates/README.md b/Tools/Templates/README.md
index e48d45706..931671c79 100644
--- a/Tools/Templates/README.md
+++ b/Tools/Templates/README.md
@@ -7,10 +7,10 @@ This is the boilerplate to create a screen that follows the MVVM-C pattern withi
 
 To use it (before it becomes an Xcode template):
 
-- `./createScreen.sh MyScreen [subFolder]`
+- `./createScreen.sh ScreenFolder MyScreenName`
 - Import the created folder in the Xcode project
 
-`subFolder` is an option subfolder under `Riot/Modules/`
+This will create ScreenFolder within the Riot/Modules. Files inside will be called `MyScreenNameXxx`.
 
 
 # FlowCoordinatorTemplate
@@ -21,4 +21,4 @@ To use it (before it becomes an Xcode template):
 - `./createFlowCoordinator.sh MyFlowCoordinator [subFolder]`
 - Import the created folder in the Xcode project
 
-`subFolder` is an option subfolder under `Riot/Modules/`
\ No newline at end of file
+`subFolder` is an option subfolder under `Riot/Modules/`
diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
index 18019a48e..1c42a0aec 100755
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -1,27 +1,16 @@
 #!/bin/bash
 
-if [ $# -eq 0 ]; then
-    echo "Usage: ./createScreen.sh MyScreen [subFolder]"
+if [ ! $# -eq 2 ]; then
+    echo "Usage: ./createScreen.sh Folder MyScreenName"
     exit 1
 fi 
 
-SCREEN_NAME=$1
+OUTPUT_DIR="../../Riot/Modules"/$1
+SCREEN_NAME=$2
 SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
 
 MODULE_DIR="../../Riot/Modules"
 
-OUTPUT_DIR="$MODULE_DIR"
-if [ $# -eq 2 ]; 
-then
-    OUTPUT_DIR="$OUTPUT_DIR/$2"
-    if [ ! -e $OUTPUT_DIR ]; then
-        echo "Create folder ${OUTPUT_DIR}"
-        mkdir $OUTPUT_DIR
-    fi 
-fi
-OUTPUT_DIR="$OUTPUT_DIR/$1"
-
-
 if [ -e $OUTPUT_DIR ]; then
     echo "Error: Folder ${OUTPUT_DIR} already exists"
     exit 1
@@ -29,7 +18,8 @@ fi
 
 echo "Create folder ${OUTPUT_DIR}"
 
-cp -R buildable/ScreenTemplate $OUTPUT_DIR
+mkdir -p $OUTPUT_DIR
+cp -R buildable/ScreenTemplate/ $OUTPUT_DIR/
 
 cd $OUTPUT_DIR
 for file in *