diff --git a/src/components/Onboarding/database-not-writeable.tsx b/src/components/Onboarding/database-not-writeable.tsx
index ac1e92527..b2d313a9d 100644
--- a/src/components/Onboarding/database-not-writeable.tsx
+++ b/src/components/Onboarding/database-not-writeable.tsx
@@ -1,7 +1,13 @@
import { Center, Code, List, Stack, Text, Title } from '@mantine/core';
import Head from 'next/head';
-export const DatabaseNotWriteable = ({ error, errorMessage }: { error: any | unknown, errorMessage: string | undefined }) => {
+export const DatabaseNotWriteable = ({
+ stringifiedError,
+ errorMessage,
+}: {
+ stringifiedError: string | undefined;
+ errorMessage: string | undefined;
+}) => {
return (
<>
@@ -30,11 +36,9 @@ export const DatabaseNotWriteable = ({ error, errorMessage }: { error: any | unk
- {error && JSON.stringify(error)}
+ {stringifiedError}
- {errorMessage && (
- {errorMessage}
- )}
+ {errorMessage && {errorMessage}}
diff --git a/src/pages/onboard.tsx b/src/pages/onboard.tsx
index ab7b4b55d..fef7b63ad 100644
--- a/src/pages/onboard.tsx
+++ b/src/pages/onboard.tsx
@@ -15,14 +15,11 @@ import { getTotalUserCountAsync } from '~/server/db/queries/user';
import { getConfig } from '~/tools/config/getConfig';
import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
-
export default function OnboardPage({
configSchemaVersions,
databaseNotWriteable,
- error,
- errorMessage
+ stringifiedError,
+ errorMessage,
}: InferGetServerSidePropsType) {
const { fn, colors, colorScheme } = useMantineTheme();
const background = colorScheme === 'dark' ? 'dark.6' : 'gray.1';
@@ -49,7 +46,7 @@ export default function OnboardPage({
{databaseNotWriteable == true ? (
-
+
) : (
<>
{onboardingSteps ? (
@@ -117,41 +114,11 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
...translations,
configSchemaVersions: configSchemaVersions,
databaseNotWriteable: true,
- error: error,
+ errorMessage: 'Database is not writeable',
+ stringifiedError: JSON.stringify(error),
},
};
}
- Consola.info('Database is writeable');
-
- if (process.platform !== 'win32') {
- try {
- const { stdout, stderr } = await exec("mount | grep '/data'");
-
- if (stderr.split('\n').length > 1 || stdout.split('\n').length <= 1) {
- Consola.error(`Database at '${rawDatabaseUrl}' has not been mounted: ${stdout.replace('\n', '\\n')} ${stderr.replace('\n', '\\n')}`);
- return {
- props: {
- ...translations,
- configSchemaVersions: configSchemaVersions,
- databaseNotWriteable: true,
- error: `Database at '${rawDatabaseUrl}' is not mounted:\n${stdout}`,
- },
- };
- }
- } catch (error) {
- const errorMessage = `Database at '${rawDatabaseUrl}' has not been mounted: ${error}`;
- Consola.error(errorMessage);
- return {
- props: {
- ...translations,
- configSchemaVersions: configSchemaVersions,
- databaseNotWriteable: true,
- error: error,
- errorMessage: errorMessage
- },
- };
- }
- }
Consola.info(`Database at '${rawDatabaseUrl}' is writeable and mounted`);
}
@@ -160,7 +127,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
props: {
...translations,
configSchemaVersions: configSchemaVersions,
- databaseNotWriteable: false
+ databaseNotWriteable: false,
},
};
};