From 687c7587df6ab1dc61cc21a3eff58bcd45af8a38 Mon Sep 17 00:00:00 2001 From: ajnart Date: Tue, 14 Nov 2023 21:11:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Remove=20the=20checks=20fo?= =?UTF-8?q?r=20mounts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/onboard.tsx | 40 ---------------------------------- src/pages/user/preferences.tsx | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/pages/onboard.tsx b/src/pages/onboard.tsx index bad0f1f23..de85c4eff 100644 --- a/src/pages/onboard.tsx +++ b/src/pages/onboard.tsx @@ -15,9 +15,6 @@ 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, @@ -123,43 +120,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { }; } 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, - errorMessage: `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, - stringifiedError: JSON.stringify(error), - errorMessage: errorMessage, - }, - }; - } - } - - Consola.info(`Database at '${rawDatabaseUrl}' is writeable and mounted`); } return { diff --git a/src/pages/user/preferences.tsx b/src/pages/user/preferences.tsx index e2eba85f0..85b81532f 100644 --- a/src/pages/user/preferences.tsx +++ b/src/pages/user/preferences.tsx @@ -11,7 +11,6 @@ import { } from '@mantine/core'; import { createFormContext } from '@mantine/form'; import { IconArrowLeft } from '@tabler/icons-react'; -import { changeLanguage } from 'i18next'; import { GetServerSideProps } from 'next'; import { useTranslation } from 'next-i18next'; import Head from 'next/head'; @@ -74,6 +73,7 @@ const SettingsComponent = ({ label: language.originalName, description: language.translatedName, value: language.shortName, + country: language.country, })); const { t, i18n } = useTranslation(['user/preferences', 'common']);