mit neuem Schalter --export_dir

bin/ioconverter.sh

@@ -21,7 +21,9 @@ JSON_POS="${FILENAME}_positionsconv.json"
 JSON_TODRAW="${FILENAME}_todraw.json"
 # Namen der Ergebnisdateien
 ERROR_DOUBLE="${FILENAME}_errors.json"
-RESULT_TIA="${FILENAME}-*_TIA.xlsx"
+
+TARGET_DIR="$PROJECT_IO_RESULTS/$FILENAME"
+mkdir -p "$TARGET_DIR"
 
 echo
 echo "=== Fetching Positions ==="
@@ -30,7 +32,8 @@ echo "=== Fetching Positions ==="
 if [ -f "$PROJECT_WORK/$ERROR_DOUBLE" ]; then
     echo "== failed: duplicate IDs in given layout"
     read -p "Press any key to continue..."
-    mv "$PROJECT_WORK/$ERROR_DOUBLE" "$PROJECT_IO_RESULTS"
+    mv "$PROJECT_WORK/$ERROR_DOUBLE" "$TARGET_DIR"
+    mv "$PROJECT_WORK/$JSON_TODRAW" "$TARGET_DIR"
     exit 1
 fi
 
@@ -41,15 +44,12 @@ if [ ! -f "$PROJECT_WORK/$JSON_POS" ]; then
 fi
 
 echo "=== Creating Excel Files for TIA, WSCAD, .. ==="
-"$SCRIPT_DIR/portalexport.sh" --filename "$JSON_POS" --outname "$FILENAME"
+"$SCRIPT_DIR/portalexport.sh" --filename "$JSON_POS" --outname "$FILENAME" --export_dir "$TARGET_DIR"
 
-if [ ! -f "$PROJECT_WORK/$RESULT_TIA" ]; then
+if ! compgen -G "$TARGET_DIR/*_TIA.xlsx" > /dev/null; then
     echo "== failed: creating .xlsx files"
     read -p "Press any key to continue..."
     exit 1
 fi
 
-mkdir -p "$PROJECT_IO_RESULTS/$FILENAME"
-echo "move $PROJECT_WORK/${FILENAME}-* $PROJECT_IO_RESULTS/$FILENAME"
-mv "$PROJECT_WORK/${FILENAME}"-* "$PROJECT_IO_RESULTS/$FILENAME"
 read -p "Press any key to continue..."