Merge pull request #8847 from gitbutlerapp/revert-8839-Lane-4

krlvi · web-flow · commit de8ca6b340e8 · 2025-05-30T12:02:50.000+02:00
Revert "Settings message - remove the force from the ln -s command"
diff --git a/apps/desktop/src/components/v3/profileSettings/GeneralSettings.svelte b/apps/desktop/src/components/v3/profileSettings/GeneralSettings.svelte
@@ -121,7 +121,7 @@
 
 	async function cli_command(): Promise<string> {
 		const path: string = await invoke('cli_path');
-		const command = 'ln -s ' + path + ' /usr/local/bin/but';
+		const command = 'ln -sf ' + path + ' /usr/local/bin/but';
 		return command;
 	}
 </script>

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@`
`121`	`121`
`122`	`122`	`async function cli_command(): Promise<string> {`
`123`	`123`	`const path: string = await invoke('cli_path');`
`124`		`- const command = 'ln -s ' + path + ' /usr/local/bin/but';`
	`124`	`+ const command = 'ln -sf ' + path + ' /usr/local/bin/but';`
`125`	`125`	`return command;`
`126`	`126`	`}`
`127`	`127`	`</script>`