Shellskripte auch angepasst
This commit is contained in:
+4
-3
@@ -13,7 +13,8 @@ INPUT_FILE="$1"
|
||||
FILENAME=$(basename "$INPUT_FILE" .dxf)
|
||||
DIR=$(dirname "$INPUT_FILE")
|
||||
|
||||
source $HOME/dxf-calculator/kabellaengen/bin/setenv.sh
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/setenv.sh"
|
||||
|
||||
# Namen der Zwischenergebnis Dateien
|
||||
JSON_POS="${FILENAME}_positionsconv.json"
|
||||
@@ -24,7 +25,7 @@ RESULT_TIA="${FILENAME}-*_TIA.xlsx"
|
||||
|
||||
echo
|
||||
echo "=== Fetching Positions ==="
|
||||
./getpositions.sh --filename "$1" -s -r -w "$JSON_POS" -e "$ERROR_DOUBLE"
|
||||
"$SCRIPT_DIR/getpositions.sh" --filename "$1" -s -r -w "$JSON_POS" -e "$ERROR_DOUBLE"
|
||||
|
||||
if [ -f "$PROJECT_WORK/$ERROR_DOUBLE" ]; then
|
||||
echo "== failed: duplicate IDs in given layout"
|
||||
@@ -40,7 +41,7 @@ if [ ! -f "$PROJECT_WORK/$JSON_POS" ]; then
|
||||
fi
|
||||
|
||||
echo "=== Creating Excel Files for TIA, WSCAD, .. ==="
|
||||
./portalexport.sh --filename "$JSON_POS" --outname "$FILENAME"
|
||||
"$SCRIPT_DIR/portalexport.sh" --filename "$JSON_POS" --outname "$FILENAME"
|
||||
|
||||
if [ ! -f "$PROJECT_WORK/$RESULT_TIA" ]; then
|
||||
echo "== failed: creating .xlsx files"
|
||||
|
||||
Reference in New Issue
Block a user