Fix quotes. Remove declare

project-oak · May 14, 2024 · 629e24b · 629e24b
1 parent ff9e27b
commit 629e24b
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 34 deletions.
diff --git a/buildconfigs/key_xor_test_app.sh b/buildconfigs/key_xor_test_app.sh
@@ -4,7 +4,7 @@
 #
 package_name=key_xor_test_app
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_containers_kernel.sh b/buildconfigs/oak_containers_kernel.sh
@@ -5,7 +5,7 @@
 # TODO: b/333745447 - Replace this file with its counterparts in ./buildconfigs_full_provenance.
 package_name=oak_containers_kernel
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#bzImageProvenance

diff --git a/buildconfigs/oak_containers_orchestrator.sh b/buildconfigs/oak_containers_orchestrator.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_containers_orchestrator
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#systemImageProvenance

diff --git a/buildconfigs/oak_containers_stage1.sh b/buildconfigs/oak_containers_stage1.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_containers_stage1
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#stage1Provenance

diff --git a/buildconfigs/oak_containers_syslogd.sh b/buildconfigs/oak_containers_syslogd.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_containers_syslogd
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#systemImageProvenance

diff --git a/buildconfigs/oak_containers_system_image.sh b/buildconfigs/oak_containers_system_image.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_containers_system_image
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#systemImageProvenance

diff --git a/buildconfigs/oak_echo_enclave_app.sh b/buildconfigs/oak_echo_enclave_app.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_echo_enclave_app
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_echo_raw_enclave_app.sh b/buildconfigs/oak_echo_raw_enclave_app.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_echo_raw_enclave_app
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_functions_enclave_app.sh b/buildconfigs/oak_functions_enclave_app.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_functions_enclave_app
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_functions_insecure_enclave_app.sh b/buildconfigs/oak_functions_insecure_enclave_app.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_functions_insecure_enclave_app
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_ml_transparency_eval.sh b/buildconfigs/oak_ml_transparency_eval.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_ml_transparency
 
-declare -a build_command=(
+build_command=(
   env
   --chdir=oak_ml_transparency/mnist
   /project/runner-musl

diff --git a/buildconfigs/oak_orchestrator.sh b/buildconfigs/oak_orchestrator.sh
@@ -4,7 +4,7 @@
 #
 package_name=oak_orchestrator
 
-declare -a build_command=(
+build_command=(
   nix
   develop
   .#rust

diff --git a/buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.sh b/buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.sh
@@ -3,16 +3,15 @@
 # Build configuration for oak_restricted_kernel_simple_io_init_rd_wrapper_bin.
 #
 # TODO: b/333745447 - Replace this file with its counterparts in ./buildconfigs_full_provenance.
-
 package_name=oak_restricted_kernel_simple_io_init_rd_wrapper_bin
 
-declare -a build_command=(
-  "nix",
-  "develop",
-  ".#rust",
-  "--command",
-  "just",
-  "oak_restricted_kernel_simple_io_init_rd_wrapper",
+build_command=(
+  nix
+  develop
+  .#rust
+  --command
+  just
+  oak_restricted_kernel_simple_io_init_rd_wrapper
 )
 
 binary_path=oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_simple_io_init_rd_wrapper_bin

diff --git a/buildconfigs/stage0_bin.sh b/buildconfigs/stage0_bin.sh
@@ -1,20 +1,22 @@
 #!/bin/sh
-
+#
+# Build configuration for stage0_bin.
+#
 package_name=stage0_bin
 
-declare -a build_command=(
-  "nix",
-  "develop",
-  ".#rust",
-  "--command",
-  "env",
-  "--chdir=stage0_bin",
-  "cargo",
-  "objcopy",
-  "--release",
-  "--",
-  "--output-target=binary",
-  "target/x86_64-unknown-none/release/stage0_bin",
+build_command=(
+  nix
+  develop
+  .#rust
+  --command
+  env
+  --chdir=stage0_bin
+  cargo
+  objcopy
+  --release
+  --
+  --output-target=binary
+  target/x86_64-unknown-none/release/stage0_bin
 )
 
 binary_path=stage0_bin/target/x86_64-unknown-none/release/stage0_bin