Fix cert formatting (#1247) (#1257)

vmware · Dec 13, 2017 · f8cc731 · f8cc731
1 parent 236fe98
commit f8cc731
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/installer/build/scripts/admiral/configure_admiral.sh b/installer/build/scripts/admiral/configure_admiral.sh
@@ -59,7 +59,7 @@ function configureScript {
 function formatCert {
   content=$1
   file=$2
-  echo "$content" | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' > "$file"
+  echo "$content" | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' | sed -r '/^$/d' > "$file"
 }
 
 function genCert {

diff --git a/installer/build/scripts/fileserver/configure_fileserver.sh b/installer/build/scripts/fileserver/configure_fileserver.sh
@@ -40,7 +40,7 @@ fi
 function formatCert {
   content=$1
   file=$2
-  echo $content | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' > $file
+  echo $content | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' | sed -r '/^$/d' > $file
 }
 
 function genCert {

diff --git a/installer/build/scripts/systemd/vic_machine_server/configure_vic_machine_server.sh b/installer/build/scripts/systemd/vic_machine_server/configure_vic_machine_server.sh
@@ -29,7 +29,7 @@ flag="${cert_dir}/cert_gen_type"
 function formatCert {
   content=$1
   file=$2
-  echo "$content" | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' > "$file"
+  echo "$content" | sed -r 's/(-{5}BEGIN [A-Z ]+-{5})/&\n/g; s/(-{5}END [A-Z ]+-{5})/\n&\n/g' | sed -r 's/.{64}/&\n/g; /^\s*$/d' | sed -r '/^$/d' > "$file"
 }
 
 function genCert {