Shellskripte auch angepasst
This commit is contained in:
+5
-4
@@ -21,11 +21,12 @@ ERROR_DOUBLE="${FILENAME}_errors.json"
|
||||
EXCEL_RES="${FILENAME}_cables.xlsx"
|
||||
DXF_RES="${FILENAME}_cables.dxf"
|
||||
|
||||
source $HOME/dxf-calculator/kabellaengen/bin/setenv.sh
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/setenv.sh"
|
||||
|
||||
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"
|
||||
@@ -42,7 +43,7 @@ fi
|
||||
|
||||
echo
|
||||
echo "=== Creating Graph for Routing ==="
|
||||
./routing.sh --filename "$JSON_POS" -w "$JSON_TODRAW"
|
||||
"$SCRIPT_DIR/routing.sh" --filename "$JSON_POS" -w "$JSON_TODRAW"
|
||||
|
||||
if [ ! -f "$PROJECT_WORK/$JSON_TODRAW" ]; then
|
||||
echo "-failed- routing"
|
||||
@@ -52,7 +53,7 @@ fi
|
||||
|
||||
echo
|
||||
echo "=== Writing Output Files ==="
|
||||
./draw_dxf.sh --filename "$JSON_TODRAW" --new "$DXF_RES" -x "$EXCEL_RES"
|
||||
"$SCRIPT_DIR/draw_dxf.sh" --filename "$JSON_TODRAW" --new "$DXF_RES" -x "$EXCEL_RES"
|
||||
|
||||
if [ ! -f "$PROJECT_WORK/$EXCEL_RES" ]; then
|
||||
echo "-failed- draw_dxf"
|
||||
|
||||
Reference in New Issue
Block a user