From a7beb7b37fb42991cacebcf3ac59968925d62467 Mon Sep 17 00:00:00 2001 From: bsourisse Date: Sun, 20 Aug 2023 21:38:55 +0200 Subject: [PATCH] fix: change "repository" to "repositoryName" --- Components/Repo/QuickCommands/QuickCommands.js | 4 ++-- Components/Repo/Repo.js | 4 ++-- .../WizardSteps/WizardStep2/WizardStep2.js | 8 ++++---- .../WizardSteps/WizardStep3/WizardStep3.js | 18 +++++++++--------- .../WizardSteps/WizardStep4/WizardStep4.js | 2 +- Containers/RepoList/RepoList.js | 2 +- Containers/SetupWizard/SetupWizard.js | 2 +- pages/api/repo/add.js | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Components/Repo/QuickCommands/QuickCommands.js b/Components/Repo/QuickCommands/QuickCommands.js index b4ff6e8..a06b155 100644 --- a/Components/Repo/QuickCommands/QuickCommands.js +++ b/Components/Repo/QuickCommands/QuickCommands.js @@ -29,7 +29,7 @@ export default function QuickCommands(props) { // Asynchronously call copy to clipboard navigator.clipboard .writeText( - `borg init -e repokey-blake2 ssh://${props.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.repository}` + `borg init -e repokey-blake2 ssh://${props.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.repositoryName}` ) .then(() => { // If successful, update the isCopied state value @@ -51,7 +51,7 @@ export default function QuickCommands(props) {
borg init -e repokey-blake2 ssh://{props.unixUser}@ {HOSTNAME}:{SSH_SERVER_PORT}/./ - {props.repository} + {props.repositoryName}
)}
diff --git a/Components/Repo/Repo.js b/Components/Repo/Repo.js index f8b1564..76320b5 100644 --- a/Components/Repo/Repo.js +++ b/Components/Repo/Repo.js @@ -79,7 +79,7 @@ export default function Repo(props) { )}
@@ -103,7 +103,7 @@ export default function Repo(props) { - {props.repository} + {props.repositoryName} {props.storageSize}Go
@@ -97,10 +97,10 @@ function WizardStep2(props) { ssh:// {props.selectedOption.unixUser}@{HOSTNAME}: {SSH_SERVER_PORT}/./ - {props.selectedOption.repository} + {props.selectedOption.repositoryName}
For more information about the Vorta graphical client, please diff --git a/Components/WizardSteps/WizardStep3/WizardStep3.js b/Components/WizardSteps/WizardStep3/WizardStep3.js index 7094aff..484a278 100644 --- a/Components/WizardSteps/WizardStep3/WizardStep3.js +++ b/Components/WizardSteps/WizardStep3/WizardStep3.js @@ -40,7 +40,7 @@ function WizardStep3(props) { borg create ssh:// {props.selectedOption.unixUser}@{HOSTNAME}: {SSH_SERVER_PORT}/./ - {props.selectedOption.repository} + {props.selectedOption.repositoryName} ::archive1 /your/pathToBackup
  • List the remote archives with :
    • @@ -105,10 +105,10 @@ function WizardStep3(props) { borg list ssh:// {props.selectedOption.unixUser}@{HOSTNAME}: {SSH_SERVER_PORT}/./ - {props.selectedOption.repository} + {props.selectedOption.repositoryName}
  • Download a remote archive with the following command :
    • @@ -123,11 +123,11 @@ function WizardStep3(props) { borg export-tar --tar-filter="gzip -9" ssh:// {props.selectedOption.unixUser}@{HOSTNAME}: {SSH_SERVER_PORT}/./ - {props.selectedOption.repository} + {props.selectedOption.repositoryName} ::archive1 archive1.tar.gz
  • @@ -145,11 +145,11 @@ function WizardStep3(props) { borg mount ssh:// {props.selectedOption.unixUser}@{HOSTNAME}: {SSH_SERVER_PORT}/./ - {props.selectedOption.repository} + {props.selectedOption.repositoryName} ::archive1 /tmp/yourMountPoint
    diff --git a/Components/WizardSteps/WizardStep4/WizardStep4.js b/Components/WizardSteps/WizardStep4/WizardStep4.js index e195085..51a269d 100644 --- a/Components/WizardSteps/WizardStep4/WizardStep4.js +++ b/Components/WizardSteps/WizardStep4/WizardStep4.js @@ -29,7 +29,7 @@ function WizardStep4(props) { repositories: # Paths of local or remote repositories to backup to. - - ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repository} + - ssh://${props.selectedOption.unixUser}@${HOSTNAME}:${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName} storage: archive_name_format: '{HOSTNAME}-documents-{now}' diff --git a/Containers/RepoList/RepoList.js b/Containers/RepoList/RepoList.js index d99875c..4c53cc6 100644 --- a/Containers/RepoList/RepoList.js +++ b/Containers/RepoList/RepoList.js @@ -100,7 +100,7 @@ export default function RepoList() { alias={repo.alias} status={repo.status} lastSave={repo.lastSave} - repository={repo.repository} + repositoryName={repo.repositoryName} storageSize={repo.storageSize} storageUsed={repo.storageUsed} sshPublicKey={repo.sshPublicKey} diff --git a/Containers/SetupWizard/SetupWizard.js b/Containers/SetupWizard/SetupWizard.js index 68a12d3..39487db 100644 --- a/Containers/SetupWizard/SetupWizard.js +++ b/Containers/SetupWizard/SetupWizard.js @@ -59,7 +59,7 @@ function SetupWizard(props) { label: `${repo.alias} - #${repo.id}`, value: `${repo.alias} - #${repo.id}`, id: repo.id, - repository: repo.repository, + repositoryName: repo.repositoryName, unixUser: repo.unixUser, lanCommand: repo.lanCommand, })); diff --git a/pages/api/repo/add.js b/pages/api/repo/add.js index b0e7e9a..b0e6a9d 100644 --- a/pages/api/repo/add.js +++ b/pages/api/repo/add.js @@ -49,7 +49,7 @@ export default async function handler(req, res) { const newRepo = { id: newID, alias: alias, - repository: 'repo' + newID, + repositoryName: '', status: false, lastSave: 0, alert: alert, @@ -67,7 +67,7 @@ export default async function handler(req, res) { const shellsDirectory = path.join(process.cwd(), '/helpers'); //Exec the shell const { stdout, stderr } = await exec( - `${shellsDirectory}/shells/createRepo.sh ${newRepo.repository} "${newRepo.sshPublicKey}" ${newRepo.storageSize}` + `${shellsDirectory}/shells/createRepo.sh "${newRepo.sshPublicKey}" ${newRepo.storageSize}` ); if (stderr) { console.log('stderr:', stderr); @@ -77,7 +77,7 @@ export default async function handler(req, res) { }); return; } - newRepo.unixUser = stdout.trim(); + newRepo.repositoryName = stdout.trim(); //Create the new repoList with the new repo let newRepoList = [newRepo, ...repoList];