From 13b751d0a96d541370194d2ffb8edc92f9d2d8d9 Mon Sep 17 00:00:00 2001
From: minghangli-uni <minghang.li1@anu.edu.au>
Date: Fri, 16 Aug 2024 15:30:23 +1000
Subject: [PATCH] Ensure consistent formatting with other bash scripts

---
 .../archive_scripts/archive_cice_restarts.sh    | 12 +++++-------
 .../setup_scripts/setup_cice_restarts.sh        | 17 ++++++++---------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/payu_config/archive_scripts/archive_cice_restarts.sh b/payu_config/archive_scripts/archive_cice_restarts.sh
index 9e254f9..bec7e04 100755
--- a/payu_config/archive_scripts/archive_cice_restarts.sh
+++ b/payu_config/archive_scripts/archive_cice_restarts.sh
@@ -3,10 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # clean up cice_restarts.sh
 
-if [ -f archive/output*/INPUT/iced.1900-01-01-10800.nc ]
-then
-rm archive/output*/INPUT/iced.1900-01-01-10800.nc
-return 0
+if [ -f archive/output*/INPUT/iced.1900-01-01-10800.nc ]; then
+    rm archive/output*/INPUT/iced.1900-01-01-10800.nc
+    return 0
 fi
 
 latest_o=$(ls -drv archive/output*[0-9] | head -1)
@@ -14,7 +13,6 @@ latest_o=$(ls -drv archive/output*[0-9] | head -1)
 #initial restart was copied from the previous run
 ic_restart=$(ls -dv $latest_o/access-om3.cice.r.* | head -1)
 
-if [ -f $latest_o/access-om3.cice.r.* ]
-then
-rm $latest_o/access-om3.cice.r.*
+if [ -f $latest_o/access-om3.cice.r.* ]; then
+    rm $latest_o/access-om3.cice.r.*
 fi
diff --git a/payu_config/setup_scripts/setup_cice_restarts.sh b/payu_config/setup_scripts/setup_cice_restarts.sh
index 941e8c7..c1e7367 100755
--- a/payu_config/setup_scripts/setup_cice_restarts.sh
+++ b/payu_config/setup_scripts/setup_cice_restarts.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 # patch for https://github.com/open-mpi/ompi/issues/12141
-if ! [ -f work/access-om3.cice.r.* ]
-then 
-# no restart files yet, use initial conditions
-IC=$(readlink work/INPUT/iced.1900-01-01-10800.nc)
-rm work/INPUT/iced.1900-01-01-10800.nc
-cp $IC work/INPUT/iced.1900-01-01-10800.nc
+if ! [ -f work/access-om3.cice.r.* ]; then
+    # no restart files yet, use initial conditions
+    IC=$(readlink work/INPUT/iced.1900-01-01-10800.nc)
+    rm work/INPUT/iced.1900-01-01-10800.nc
+    cp $IC work/INPUT/iced.1900-01-01-10800.nc
 else
-# change restart symlink to hardlink
-RESTART=$(echo work/access-om3.cice.r.*)
-ln -f $(readlink $RESTART) $RESTART
+    # change restart symlink to hardlink
+    RESTART=$(echo work/access-om3.cice.r.*)
+    ln -f $(readlink $RESTART) $RESTART
 fi