Skip to content

Commit e6a8bf2

Browse files
authored
Avoid bash dependency in rayvens-setup.sh (#28)
1 parent 20894d7 commit e6a8bf2

File tree

1 file changed

+14
-30
lines changed

1 file changed

+14
-30
lines changed

scripts/rayvens-setup.sh

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ cpu="1"
2626
mem="2G"
2727
project_dir=""
2828
project_requirements_file=""
29-
project_dependencies=()
30-
project_pip_dependencies=()
29+
project_dependencies=""
30+
project_pip_dependencies=""
3131

3232
while [ -n "$1" ]; do
3333
case "$1" in
@@ -50,8 +50,8 @@ while [ -n "$1" ]; do
5050
--version) version="1";;
5151
--install-project) install_project="1";;
5252
--project-dir) shift; project_dir=$1;;
53-
-d|--project-dep) shift; project_dependencies+=("$1");;
54-
-p|--project-pip-dep) shift; project_pip_dependencies+=("$1");;
53+
-d|--project-dep) shift; project_dependencies="$project_dependencies $1";;
54+
-p|--project-pip-dep) shift; project_pip_dependencies="$project_pip_dependencies $1";;
5555
--project-requirements) shift; project_requirements_file=$1;;
5656
--requirements-in-project-dir) requirements_in_project_dir="1";;
5757

@@ -409,25 +409,17 @@ EOF
409409
head_setup_commands:
410410
EOF
411411

412-
if [ "${#project_dependencies[@]}" -gt "0" ]; then
412+
if [ -n "$project_dependencies" ]; then
413413
cat >> "$config" << EOF
414414
- sudo apt-get update
415+
- sudo apt-get -y install$project_dependencies
415416
EOF
416-
for dependency in "${project_dependencies[@]}"
417-
do
418-
cat >> "$config" << EOF
419-
- sudo apt-get -y install $dependency
420-
EOF
421-
done
422417
fi
423418

424-
if [ "${#project_pip_dependencies[@]}" -gt "0" ]; then
425-
for pip_dependency in "${project_pip_dependencies[@]}"
426-
do
427-
cat >> "$config" << EOF
428-
- pip install $pip_dependency
419+
if [ -n "$project_pip_dependencies" ]; then
420+
cat >> "$config" << EOF
421+
- pip install$project_pip_dependencies
429422
EOF
430-
done
431423
fi
432424

433425
if [ -n "$requirements_in_project_dir" ]; then
@@ -450,25 +442,17 @@ EOF
450442
worker_setup_commands:
451443
EOF
452444

453-
if [ "${#project_dependencies[@]}" -gt "0" ]; then
445+
if [ -n "$project_dependencies" ]; then
454446
cat >> "$config" << EOF
455447
- sudo apt-get update
448+
- sudo apt-get -y install$project_dependencies
456449
EOF
457-
for dependency in "${project_dependencies[@]}"
458-
do
459-
cat >> "$config" << EOF
460-
- sudo apt-get -y install $dependency
461-
EOF
462-
done
463450
fi
464451

465-
if [ "${#project_pip_dependencies[@]}" -gt "0" ]; then
466-
for pip_dependency in "${project_pip_dependencies[@]}"
467-
do
468-
cat >> "$config" << EOF
469-
- pip install $pip_dependency
452+
if [ -n "$project_pip_dependencies" ]; then
453+
cat >> "$config" << EOF
454+
- pip install$project_pip_dependencies
470455
EOF
471-
done
472456
fi
473457

474458
if [ -n "$requirements_in_project_dir" ]; then

0 commit comments

Comments
 (0)