--- a/bin/idea.sh	Thu Sep 06 02:01:20 2018 -0400
+++ b/bin/idea.sh	Thu Sep 06 13:13:35 2018 +0100
@@ -113,21 +113,14 @@
   echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
-
-addSourceFolder() {
-  root=$@
-  relativePath="`echo "$root" | sed -e s@"$TOP/\(.*$\)"@"\1"@`"
-  folder="`echo "$SOURCE_FOLDER" | sed -e s@"\(.*/\)####\(.*\)"@"\1$relativePath\2"@`"
-  printf "%s\n" "$folder" >> $IDEA_JDK
-}
-
 ### Replace template variables
 
 NUM_REPLACEMENTS=0
 
 replace_template_file() {
     for i in $(seq 1 $NUM_REPLACEMENTS); do
-      eval "sed -i \"s|\${FROM${i}}|\${TO${i}}|g\" $1"
+      eval "sed \"s|\${FROM${i}}|\${TO${i}}|g\" $1 > $1.tmp"
+      mv $1.tmp $1
     done
 }
 
@@ -154,7 +147,7 @@
 SOURCE_POSTFIX="\" isTestSource=\"false\" />"
 
 for root in $MODULE_ROOTS; do
-    SOURCES=$SOURCES"\n$SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done
 
 add_replacement "###SOURCE_ROOTS###" "$SOURCES"