Skip to content

Commit 12fc421

Browse files
committed
Add bash-tools deployment
1 parent b6dafd4 commit 12fc421

1 file changed

Lines changed: 27 additions & 1 deletion

File tree

tools/deploy.sh

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ includes_non_generated="$tools_dir/non-generated.txt"
8686
includes_generated="$tools_dir/generated.txt"
8787
includes_offline="$tools_dir/offline.txt"
8888
deploy_src_dir="$(realpath "$src_dir")/"
89+
bashtools_src_dir="$(realpath "$proj_dir")/external/bash-tools/src/"
8990

9091
check_file_exists includes_non_generated
9192
check_file_exists includes_generated
9293
check_file_exists includes_offline
9394
check_directory_exists deploy_src_dir
95+
check_directory_exists bashtools_src_dir
9496

9597
print_failed_checks --error
9698

@@ -207,7 +209,7 @@ if [[ $usb_mode == true ]]; then
207209
# includes-file but not existing in source filesystem
208210
rsync -avh \
209211
--progress \
210-
--delete \
212+
--delete-after \
211213
--include-from="$includes_non_generated" \
212214
--include-from="$includes_offline" \
213215
--exclude="*" \
@@ -222,6 +224,18 @@ if [[ $usb_mode == true ]]; then
222224
$rsync_opts \
223225
"$deploy_src_dir" "$usb_dist_dir"
224226

227+
# copy over bash-tools
228+
rsync -avh \
229+
--progress \
230+
--delete-after \
231+
--relative \
232+
--include='*/' \
233+
--exclude='__*.sh' \
234+
--include='*.sh' \
235+
--exclude='*' \
236+
$rsync_opts \
237+
"$bashtools_src_dir" "$usb_dist_dir"
238+
225239
# deploy the unseal.sh script to the dist parent dir
226240
unseal_dest="$client_pc_usb_data_drive/unseal.sh"
227241
sudo cp -fv "$tools_dir/unseal.sh" "$unseal_dest"
@@ -254,6 +268,18 @@ else
254268
--exclude="*" \
255269
$rsync_opts \
256270
"$deploy_src_dir" "${node_server_username}@${node_server_hostname}:$dist_dirname"
271+
272+
# copy over bash-tools
273+
rsync -av -e "ssh -p $node_server_ssh_port" \
274+
--progress \
275+
--relative \
276+
--delete-after \
277+
--include='*/' \
278+
--exclude='__*.sh' \
279+
--include='*.sh' \
280+
--exclude='*' \
281+
$rsync_opts \
282+
"$bashtools_src_dir" "${node_server_username}@${node_server_hostname}:$dist_dirname"
257283
fi
258284

259285
# -------------------------- POSTCONDITIONS -----------------------------------

0 commit comments

Comments
 (0)