diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index 6bd9bb7b..e49b47bd 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -78,22 +78,24 @@ var defaultConfig = Conf{ }, Variables: map[string]Variable{ + // The default commands assume that the executables are available on $PATH. "blender": { Direction: "oneway", Values: VariableValues{ - VariableValue{Platform: "linux", Value: "/linux/path/to/blender"}, - VariableValue{Platform: "windows", Value: "C:/windows/path/to/blender.exe"}, - VariableValue{Platform: "darwin", Value: "/Volumes/Applications/Blender/blender"}, + VariableValue{Platform: "linux", Value: "blender --factory-startup --background"}, + VariableValue{Platform: "windows", Value: "blender.exe --factory-startup --background"}, + VariableValue{Platform: "darwin", Value: "blender --factory-startup --background"}, }, }, "ffmpeg": { Direction: "oneway", Values: VariableValues{ - VariableValue{Platform: "linux", Value: "/usr/bin/ffmpeg"}, - VariableValue{Platform: "windows", Value: "C:/windows/path/to/ffmpeg.exe"}, - VariableValue{Platform: "darwin", Value: "/Volumes/Applications/FFmpeg/ffmpeg"}, + VariableValue{Platform: "linux", Value: "ffmpeg"}, + VariableValue{Platform: "windows", Value: "ffmpeg.exe"}, + VariableValue{Platform: "darwin", Value: "ffmpeg"}, }, }, + // TODO: determine useful defaults for these. "job_storage": { Direction: "twoway", Values: VariableValues{ diff --git a/internal/manager/config/settings_test.go b/internal/manager/config/settings_test.go index 423c97b1..db00cc6c 100644 --- a/internal/manager/config/settings_test.go +++ b/internal/manager/config/settings_test.go @@ -38,7 +38,7 @@ func TestDefaultSettings(t *testing.T) { assert.Contains(t, config.Variables, "job_storage") assert.Contains(t, config.Variables, "render") assert.Equal(t, "oneway", config.Variables["ffmpeg"].Direction) - assert.Equal(t, "/usr/bin/ffmpeg", config.Variables["ffmpeg"].Values[0].Value) + assert.Equal(t, "ffmpeg", config.Variables["ffmpeg"].Values[0].Value) assert.Equal(t, "linux", config.Variables["ffmpeg"].Values[0].Platform) linuxPVars, ok := config.VariablesLookup["workers"]["linux"]