Install: Regenerate shell scripts

simmsa · simmsa · commit 40c176a81714 · 2025-09-29T12:56:31.000-06:00
diff --git a/mhkit/package/shell_script_templates/step2_install_conda.ps1.j2 b/mhkit/package/shell_script_templates/step2_install_conda.ps1.j2
@@ -40,11 +40,9 @@ function Install-Conda {
     Write-Output "CONDA_PATH=$condaPath"
 }
 
-# Main execution
 function Main {
     Write-Info "Step 2: Installing miniconda..."
     Install-Conda
 }
 
-# Run main function
-Main
+Main
diff --git a/mhkit/package/shell_scripts/step1_detect_conda.ps1 b/mhkit/package/shell_scripts/step1_detect_conda.ps1
@@ -144,11 +144,9 @@ function Find-Conda {
     Write-Output "CONDA_DETECTED=false"
 }
 
-# Main execution
 function Main {
     Write-Info "Step 1: Detecting conda installation..."
     Find-Conda
 }
 
-# Run main function
-Main
+Main
diff --git a/mhkit/package/shell_scripts/step1_detect_conda.sh b/mhkit/package/shell_scripts/step1_detect_conda.sh
@@ -159,11 +159,9 @@ detect_conda() {
     return 1
 }
 
-# Main execution
 main() {
     log_info "Step 1: Detecting conda installation..."
     detect_conda
 }
 
-# Run main function
-main "$@"
+main "$@"
diff --git a/mhkit/package/shell_scripts/step2_install_conda.ps1 b/mhkit/package/shell_scripts/step2_install_conda.ps1
@@ -100,11 +100,9 @@ function Install-Conda {
     Write-Output "CONDA_PATH=$condaPath"
 }
 
-# Main execution
 function Main {
     Write-Info "Step 2: Installing miniconda..."
     Install-Conda
 }
 
-# Run main function
-Main
+Main
diff --git a/mhkit/package/shell_scripts/step2_install_conda.sh b/mhkit/package/shell_scripts/step2_install_conda.sh
@@ -114,11 +114,9 @@ install_conda() {
     echo "CONDA_PATH=$HOME/miniconda3/bin/conda"
 }
 
-# Main execution
 main() {
     log_info "Step 2: Installing miniconda..."
     install_conda
 }
 
-# Run main function
-main "$@"
+main "$@"
diff --git a/mhkit/package/shell_scripts/step3_create_env.ps1 b/mhkit/package/shell_scripts/step3_create_env.ps1
@@ -129,7 +129,6 @@ function Test-PythonVersion {
     }
 }
 
-# Main execution
 function Main {
     param([string]$CondaPath)
 
@@ -149,9 +148,9 @@ function Main {
         Write-Info "Recreating environment with correct Python version..."
         & "$CondaPath" remove -n $CONDA_ENV_NAME --all -y 2>$null
         New-CondaEnv $CondaPath
-        Test-PythonVersion $CondaPath  # This should succeed now
+        Test-PythonVersion $CondaPath 
     }
 }
 
 # Run main function with arguments
-Main $args[0]
+Main $args[0]
diff --git a/mhkit/package/shell_scripts/step3_create_env.sh b/mhkit/package/shell_scripts/step3_create_env.sh
@@ -128,7 +128,6 @@ verify_python_version() {
     fi
 }
 
-# Main execution
 main() {
     local conda_path="$1"
     if [[ -z "$conda_path" ]]; then
@@ -151,9 +150,8 @@ main() {
         log_info "Recreating environment with correct Python version..."
         "$conda_path" remove -n "$CONDA_ENV_NAME" --all -y >/dev/null 2>&1 || true
         create_conda_env "$conda_path"
-        verify_python_version "$conda_path"  # This should succeed now
+        verify_python_version "$conda_path"
     fi
 }
 
-# Run main function
-main "$@"
+main "$@"
diff --git a/mhkit/package/shell_scripts/step4_install_dependencies.ps1 b/mhkit/package/shell_scripts/step4_install_dependencies.ps1
@@ -67,11 +67,11 @@ function Install-PreDependencies {
 
     Write-Info "Installing pre-install dependencies..."
 
-    Write-Info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y"
+    Write-Info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y"
     try {
-        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y
+        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y
     } catch {
-        Write-Error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y"
+        Write-Error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y"
         Write-Output "PRE_DEPS_INSTALLED=false"
         exit 1
     }
@@ -196,7 +196,6 @@ function Install-MhkitPythonUtils {
     }
 }
 
-# Main execution
 function Main {
     param([string]$CondaPath)
 
@@ -218,4 +217,4 @@ function Main {
 }
 
 # Run main function with arguments
-Main $args[0]
+Main $args[0]
diff --git a/mhkit/package/shell_scripts/step4_install_dependencies.sh b/mhkit/package/shell_scripts/step4_install_dependencies.sh
@@ -76,18 +76,18 @@ install_pre_dependencies() {
     export PATH="$conda_dir:$PATH"
 
     if [[ "$OS_TYPE" == "Darwin" ]]; then
-        log_info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y"
-        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y
+        log_info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y"
+        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y
         if [ $? -ne 0 ]; then
-            log_error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y"
+            log_error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y"
             echo "PRE_DEPS_INSTALLED=false"
             exit 1
         fi
     else
-        log_info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y"
-        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y
+        log_info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y"
+        conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y
         if [ $? -ne 0 ]; then
-            log_error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 gfortran pandas numpy -y"
+            log_error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf cftime netcdf4 pandas numpy -c conda-forge -y"
             echo "PRE_DEPS_INSTALLED=false"
             exit 1
         fi
@@ -213,7 +213,6 @@ install_mhkit_python_utils() {
     fi
 }
 
-# Main execution
 main() {
     local conda_path="$1"
     if [[ -z "$conda_path" ]]; then
@@ -233,5 +232,4 @@ main() {
     install_mhkit_python_utils "$conda_path"
 }
 
-# Run main function
-main "$@"
+main "$@"
diff --git a/mhkit/package/shell_scripts/step5_post_install.ps1 b/mhkit/package/shell_scripts/step5_post_install.ps1
@@ -125,7 +125,6 @@ function Get-PythonPath {
     }
 }
 
-# Main execution
 function Main {
     param([string]$CondaPath)
 
@@ -145,4 +144,4 @@ function Main {
 }
 
 # Run main function with arguments
-Main $args[0]
+Main $args[0]
diff --git a/mhkit/package/shell_scripts/step5_post_install.sh b/mhkit/package/shell_scripts/step5_post_install.sh
@@ -176,7 +176,6 @@ get_python_path() {
     echo "PYTHON_PATH=$python_path"
 }
 
-# Main execution
 main() {
     local conda_path="$1"
     if [[ -z "$conda_path" ]]; then
@@ -194,5 +193,4 @@ main() {
     log_success "Post-install configuration completed!"
 }
 
-# Run main function
-main "$@"
+main "$@"

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,9 @@ function Install-Conda {`
`40`	`40`	`Write-Output "CONDA_PATH=$condaPath"`
`41`	`41`	`}`
`42`	`42`
`43`		`-# Main execution`
`44`	`43`	`function Main {`
`45`	`44`	`Write-Info "Step 2: Installing miniconda..."`
`46`	`45`	`Install-Conda`
`47`	`46`	`}`
`48`	`47`
`49`		`-# Run main function`
`50`		`-Main`
	`48`	`+Main`
Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,9 @@ function Find-Conda {`
`144`	`144`	`Write-Output "CONDA_DETECTED=false"`
`145`	`145`	`}`
`146`	`146`
`147`		`-# Main execution`
`148`	`147`	`function Main {`
`149`	`148`	`Write-Info "Step 1: Detecting conda installation..."`
`150`	`149`	`Find-Conda`
`151`	`150`	`}`
`152`	`151`
`153`		`-# Run main function`
`154`		`-Main`
	`152`	`+Main`
Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,9 @@ detect_conda() {`
`159`	`159`	`return 1`
`160`	`160`	`}`
`161`	`161`
`162`		`-# Main execution`
`163`	`162`	`main() {`
`164`	`163`	`log_info "Step 1: Detecting conda installation..."`
`165`	`164`	`detect_conda`
`166`	`165`	`}`
`167`	`166`
`168`		`-# Run main function`
`169`		`-main "$@"`
	`167`	`+main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,9 @@ function Install-Conda {`
`100`	`100`	`Write-Output "CONDA_PATH=$condaPath"`
`101`	`101`	`}`
`102`	`102`
`103`		`-# Main execution`
`104`	`103`	`function Main {`
`105`	`104`	`Write-Info "Step 2: Installing miniconda..."`
`106`	`105`	`Install-Conda`
`107`	`106`	`}`
`108`	`107`
`109`		`-# Run main function`
`110`		`-Main`
	`108`	`+Main`
Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,9 @@ install_conda() {`
`114`	`114`	`echo "CONDA_PATH=$HOME/miniconda3/bin/conda"`
`115`	`115`	`}`
`116`	`116`
`117`		`-# Main execution`
`118`	`117`	`main() {`
`119`	`118`	`log_info "Step 2: Installing miniconda..."`
`120`	`119`	`install_conda`
`121`	`120`	`}`
`122`	`121`
`123`		`-# Run main function`
`124`		`-main "$@"`
	`122`	`+main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ function Test-PythonVersion {`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`-# Main execution`
`133`	`132`	`function Main {`
`134`	`133`	`param([string]$CondaPath)`
`135`	`134`
`@@ -149,9 +148,9 @@ function Main {`
`149`	`148`	`Write-Info "Recreating environment with correct Python version..."`
`150`	`149`	`& "$CondaPath" remove -n $CONDA_ENV_NAME --all -y 2>$null`
`151`	`150`	`New-CondaEnv $CondaPath`
`152`		`- Test-PythonVersion $CondaPath # This should succeed now`
	`151`	`+ Test-PythonVersion $CondaPath`
`153`	`152`	`}`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`# Run main function with arguments`
`157`		`-Main $args[0]`
	`156`	`+Main $args[0]`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,11 @@ function Install-PreDependencies {`
`67`	`67`
`68`	`68`	`Write-Info "Installing pre-install dependencies..."`
`69`	`69`
`70`		`- Write-Info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y"`
	`70`	`+ Write-Info "Executing: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y"`
`71`	`71`	`try {`
`72`		`- conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y`
	`72`	`+ conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y`
`73`	`73`	`} catch {`
`74`		`- Write-Error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 gfortran pandas numpy -y"`
	`74`	`+ Write-Error "Failed to execute: conda run -n mhkit-matlab-env conda install pip hdf5 libnetcdf netcdf4 pandas numpy -c conda-forge -y"`
`75`	`75`	`Write-Output "PRE_DEPS_INSTALLED=false"`
`76`	`76`	`exit 1`
`77`	`77`	`}`
`@@ -196,7 +196,6 @@ function Install-MhkitPythonUtils {`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`-# Main execution`
`200`	`199`	`function Main {`
`201`	`200`	`param([string]$CondaPath)`
`202`	`201`
`@@ -218,4 +217,4 @@ function Main {`
`218`	`217`	`}`
`219`	`218`
`220`	`219`	`# Run main function with arguments`
`221`		`-Main $args[0]`
	`220`	`+Main $args[0]`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ function Get-PythonPath {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-# Main execution`
`129`	`128`	`function Main {`
`130`	`129`	`param([string]$CondaPath)`
`131`	`130`
`@@ -145,4 +144,4 @@ function Main {`
`145`	`144`	`}`
`146`	`145`
`147`	`146`	`# Run main function with arguments`
`148`		`-Main $args[0]`
	`147`	`+Main $args[0]`