fix sed handling in macOS (#7)

* fix(lib): 🐛 fix sed handling in macOS

Resolves #6

* fix(lib): ♻️ refactor function for better way of working

* remove dangerous generate_secrets call

* lint

* only make a single sed call and simplify error handling

* put backup back in

---------

Co-authored-by: nicktrn <[email protected]>

Author: mcnaveen

lib.sh

@@ -14,11 +14,38 @@ docker_compose() {
     set +x
 }
 
+sed_cmd() {
+    # Determine the sed in-place flag based on the operating system
+    if [ "$(uname)" = "Darwin" ]; then
+        sed -i '' "$@"
+    else
+        sed -i "$@"
+    fi
+}
+
+write_secrets() {
+    env_file="$1"
+
+    sed_cmd \
+        -e "s|^MAGIC_LINK_SECRET=.*|MAGIC_LINK_SECRET=$MAGIC_LINK_SECRET|" \
+        -e "s|^SESSION_SECRET=.*|SESSION_SECRET=$SESSION_SECRET|" \
+        -e "s|^ENCRYPTION_KEY=.*|ENCRYPTION_KEY=$ENCRYPTION_KEY|" \
+        -e "s|^PROVIDER_SECRET=.*|PROVIDER_SECRET=$PROVIDER_SECRET|" \
+        -e "s|^COORDINATOR_SECRET=.*|COORDINATOR_SECRET=$COORDINATOR_SECRET|" \
+        "$env_file"
+
+    if [ $? -ne 0 ]; then
+        return 1
+    fi
+
+    echo "Wrote secrets to $(basename "$env_file")"
+}
+
 generate_secrets() {
     env_file=$1
 
     echo "Generated secrets:"
-    
+
     MAGIC_LINK_SECRET=$(openssl rand -hex 16)
     echo MAGIC_LINK_SECRET="$MAGIC_LINK_SECRET"
 
@@ -34,14 +61,6 @@ generate_secrets() {
     COORDINATOR_SECRET=$(openssl rand -hex 32)
     echo COORDINATOR_SECRET="$COORDINATOR_SECRET"
 
-    write_secrets() {
-        sed -i "s/MAGIC_LINK_SECRET=.*/MAGIC_LINK_SECRET=$MAGIC_LINK_SECRET/" "$env_file"
-        sed -i "s/SESSION_SECRET=.*/SESSION_SECRET=$SESSION_SECRET/" "$env_file"
-        sed -i "s/ENCRYPTION_KEY=.*/ENCRYPTION_KEY=$ENCRYPTION_KEY/" "$env_file"
-        sed -i "s/PROVIDER_SECRET=.*/PROVIDER_SECRET=$PROVIDER_SECRET/" "$env_file"
-        sed -i "s/COORDINATOR_SECRET=.*/COORDINATOR_SECRET=$COORDINATOR_SECRET/" "$env_file"
-    }
-
     if [ -z "$env_file" ]; then
         return
     fi
@@ -56,9 +75,11 @@ generate_secrets() {
             * )
                 env_example_file=$(dirname "$env_file")/.env.example
                 cp -v "$env_example_file" "$env_file"
-                
+
                 echo "Writing secrets to $(basename "$env_file")"
-                write_secrets
+                if ! write_secrets "$env_file"; then
+                    return 1
+                fi
                 ;;
         esac
     fi
@@ -70,12 +91,16 @@ generate_secrets() {
             echo "Skipped writing secrets. You may want to add them manually to $(basename "$env_file")"
             ;;
         * )
+            if ! cp "$env_file" "$env_file.backup"; then
+                echo "Failed to backup $(basename "$env_file")"
+                return 1
+            fi
+            echo "Wrote backup to $(basename "$env_file").backup"
+
             echo "Overwriting secrets in $(basename "$env_file")"
-            cp -v "$env_file" "$env_file.backup"
-            write_secrets
-            echo "Done. Backup written to: $(basename "$env_file").backup"
+            if ! write_secrets "$env_file"; then
+                return 1
+            fi
             ;;
     esac
-
-
-}
+}

start.sh

@@ -36,7 +36,10 @@ if [ ! -f "$env_file" ]; then
                     echo "Skipping secret generation. You should really not skip this step."
                     ;;
                 * )
-                    generate_secrets "$env_file"
+                    if ! generate_secrets "$env_file"; then
+                        echo "Failed to generate secrets. Exiting."
+                        exit 1
+                    fi
                     sleep 2
                     ;;
             esac
@@ -52,4 +55,4 @@ else
     extra_args="-p=trigger-$kind"
 fi
 
-docker_compose -f "$compose_file" "$extra_args" up "$@"
+docker_compose -f "$compose_file" "$extra_args" up "$@"