Actually fix script_dir statements

Rat-OS · Jan 5, 2024 · d24c77b · d24c77b
1 parent a9711ce
commit d24c77b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/bin/ratos b/src/bin/ratos
@@ -1,6 +1,5 @@
 #!/bin/bash
-BIN_LOCATION=$(realpath "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"/ratos)
-SCRIPT_DIR=$(dirname "$BIN_LOCATION")
+SCRIPT_DIR=$( cd -- "$( dirname -- "$(realpath -- "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )
 RATOS_BIN_CWD=$(pwd)
 export RATOS_BIN_CWD
 pnpm run --silent -C "$SCRIPT_DIR"/.. cli "$@"

diff --git a/src/cli/components/status.tsx b/src/cli/components/status.tsx
@@ -18,8 +18,8 @@ export const Status: React.FC<StatusProps> = (props) => {
 	return (
 		<Box flexDirection="column">
 			{hasError ? <Text color="red">Error!</Text> : <Text color="green">Success!</Text>}
-			{results.map(({ message, result }) => (
-				<Box key={message}>
+			{results.map(({ message, result }, i) => (
+				<Box key={i}>
 					{result === 'success' ? (
 						<Text color="green" bold={true}>
 							✓{' '}

diff --git a/src/scripts/post-merge.sh b/src/scripts/post-merge.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-SCRIPT_DIR=$(realpath "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )")
+SCRIPT_DIR=$( cd -- "$( dirname -- "$(realpath -- "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )
 # Script dir is scripts
 sudo "$SCRIPT_DIR"/update.sh