Skip to content

Commit 842a9a1

Browse files
committed
[#561] Configuration Script Organizational Updates
1 parent 66f6abb commit 842a9a1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scripts/cfg/config.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ ORIGINAL_CONFIG="$BASE_DIR/cfg/nos3-mission.xml"
99
CONFIG_FILE="$ORIGINAL_CONFIG"
1010

1111
# Make flight software configuration directory
12-
mkdir -p "$BASE_DIR/cfg/build"
12+
mkdir -p "$BASE_DIR/cfg/build/temp_mission/"
13+
cp -r "$BASE_DIR/cfg/nos3-mission.xml" "$BASE_DIR/cfg/build/temp_mission/"
1314

1415
# Copy baseline configurations into build directory
1516
cp -r "$BASE_DIR/cfg/InOut" "$BASE_DIR/cfg/build/"
@@ -27,7 +28,7 @@ if [ -n "${SC1_CFG// }" ]; then
2728
fi
2829

2930
echo "Overriding <sc-1-cfg> with: $REL_SC1_CFG"
30-
TEMP_CONFIG=$(mktemp "$BASE_DIR/cfg/XXXXXX.xml")
31+
TEMP_CONFIG=$(mktemp "$BASE_DIR/cfg/build/temp_mission/XXXXXX.xml")
3132
sed "s|<sc-1-cfg>.*</sc-1-cfg>|<sc-1-cfg>$REL_SC1_CFG</sc-1-cfg>|" "$ORIGINAL_CONFIG" > "$TEMP_CONFIG"
3233
CONFIG_FILE="$TEMP_CONFIG"
3334

scripts/cfg/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
sys.exit(1)
1919

2020
# Parse mission configuration
21-
mission_tree = ET.parse("./cfg/" + os.path.basename(mission_file))
21+
mission_tree = ET.parse("./cfg/build/temp_mission/" + os.path.basename(mission_file))
2222
mission_root = mission_tree.getroot()
2323
mission_start_time = mission_root.find('start-time').text
2424
print(' start-time:', mission_start_time)

0 commit comments

Comments
 (0)