fix(shell): remove non-existent functions file from shell configuration

- Remove functions source line from install/configs/shell/rc
- Remove ShellFunctionsTemplate constant from config
- Remove functions from postinstall templates map
- Fixes error: /home/user/.local/share/archup/default/bash/functions: No such file or directory

commit: 2b2185232625aee489043a87993d9a25f41a6780
author: bnema · 12mo ago · 2025-10-26 21:32 UTC
parent: 3b40e07
signature: unsigned

3 files · +14 -10

M install/configs/shell/rc +0 -1


@@ -2,4 +2,3 @@ source ~/.local/share/archup/default/bash/shell
2	2		source ~/.local/share/archup/default/bash/init
3	3		source ~/.local/share/archup/default/bash/aliases
4	4		source ~/.local/share/archup/default/bash/envs
5		-	source ~/.local/share/archup/default/bash/functions


@@ -2,4 +2,3 @@ source ~/.local/share/archup/default/bash/shell
2		source ~/.local/share/archup/default/bash/init	2	source ~/.local/share/archup/default/bash/init
3		source ~/.local/share/archup/default/bash/aliases	3	source ~/.local/share/archup/default/bash/aliases
4		source ~/.local/share/archup/default/bash/envs	4	source ~/.local/share/archup/default/bash/envs
5	-	source ~/.local/share/archup/default/bash/functions

M internal/config/config.go +14 -8


@@ -19,13 +19,12 @@ const (
19	19		LimineConfigTemplate = "configs/limine.conf.template"
20	20		ChaoticConfigFile = "configs/chaotic-aur.conf"
21	21		StarshipConfigTemplate = "configs/shell/starship.toml"
22		-	ShellConfigTemplate = "configs/shell/shell"
23		-	ShellInitTemplate = "configs/shell/init"
24		-	ShellAliasesTemplate = "configs/shell/aliases"
25		-	ShellEnvsTemplate = "configs/shell/envs"
26		-	ShellFunctionsTemplate = "configs/shell/functions"
27		-	ShellRcTemplate = "configs/shell/rc"
28		-	BashrcTemplate = "configs/shell/bashrc"
	22	+	ShellConfigTemplate = "configs/shell/shell"
	23	+	ShellInitTemplate = "configs/shell/init"
	24	+	ShellAliasesTemplate = "configs/shell/aliases"
	25	+	ShellEnvsTemplate = "configs/shell/envs"
	26	+	ShellRcTemplate = "configs/shell/rc"
	27	+	BashrcTemplate = "configs/shell/bashrc"
29	28		)
30	29
31	30		// Encryption types

@@ -239,8 +238,15 @@ type Config struct {
239	238		func NewConfig(version string) *Config {
240	239		// Determine which branch to use based on version
241	240		branch := "main"
242		-	if version == "dev" \|\| version == "" {
	241	+	switch {
	242	+	case version == "dev" \|\| version == "":
243	243		branch = "dev"
	244	+	case strings.Contains(version, "-dev"):
	245	+	branch = "dev"
	246	+	case strings.Contains(version, "-next"):
	247	+	branch = "dev"
	248	+	default:
	249	+	branch = "main"
244	250		}
245	251
246	252		return &Config{

 	LimineConfigTemplate   = "configs/limine.conf.template"
 	ChaoticConfigFile      = "configs/chaotic-aur.conf"
 	StarshipConfigTemplate = "configs/shell/starship.toml"
-	ShellConfigTemplate    = "configs/shell/shell"
+	ShellConfigTemplate  = "configs/shell/shell"
-	ShellInitTemplate      = "configs/shell/init"
+	ShellInitTemplate    = "configs/shell/init"
-	ShellAliasesTemplate   = "configs/shell/aliases"
+	ShellAliasesTemplate = "configs/shell/aliases"
-	ShellEnvsTemplate      = "configs/shell/envs"
+	ShellEnvsTemplate    = "configs/shell/envs"
-	ShellFunctionsTemplate = "configs/shell/functions"
+	ShellRcTemplate      = "configs/shell/rc"
-	ShellRcTemplate        = "configs/shell/rc"
+	BashrcTemplate       = "configs/shell/bashrc"
-	BashrcTemplate         = "configs/shell/bashrc"
 )
 // Encryption types
 func NewConfig(version string) *Config {
 	// Determine which branch to use based on version
 	branch := "main"
-	if version == "dev" || version == "" {
+	switch {
+	case version == "dev" || version == "":
 		branch = "dev"
+	case strings.Contains(version, "-dev"):
+		branch = "dev"
+	case strings.Contains(version, "-next"):
+		branch = "dev"
+	default:
+		branch = "main"
 	}
 	return &Config{

M internal/phases/postinstall.go +0 -1


@@ -486,7 +486,6 @@ func (p *PostInstallPhase) copyShellTemplates(archupDefault, archupDefaultBash s
486	486		config.ShellInitTemplate: filepath.Join(archupDefaultBash, "init"),
487	487		config.ShellAliasesTemplate: filepath.Join(archupDefaultBash, "aliases"),
488	488		config.ShellEnvsTemplate: filepath.Join(archupDefaultBash, "envs"),
489		-	config.ShellFunctionsTemplate: filepath.Join(archupDefaultBash, "functions"),
490	489		config.ShellRcTemplate: filepath.Join(archupDefaultBash, "rc"),
491	490		config.StarshipConfigTemplate: filepath.Join(archupDefault, "starship.toml"),
492	491		}


@@ -486,7 +486,6 @@ func (p *PostInstallPhase) copyShellTemplates(archupDefault, archupDefaultBash s
486		config.ShellInitTemplate: filepath.Join(archupDefaultBash, "init"),	486	config.ShellInitTemplate: filepath.Join(archupDefaultBash, "init"),
487		config.ShellAliasesTemplate: filepath.Join(archupDefaultBash, "aliases"),	487	config.ShellAliasesTemplate: filepath.Join(archupDefaultBash, "aliases"),
488		config.ShellEnvsTemplate: filepath.Join(archupDefaultBash, "envs"),	488	config.ShellEnvsTemplate: filepath.Join(archupDefaultBash, "envs"),
489	-	config.ShellFunctionsTemplate: filepath.Join(archupDefaultBash, "functions"),
490		config.ShellRcTemplate: filepath.Join(archupDefaultBash, "rc"),	489	config.ShellRcTemplate: filepath.Join(archupDefaultBash, "rc"),
491		config.StarshipConfigTemplate: filepath.Join(archupDefault, "starship.toml"),	490	config.StarshipConfigTemplate: filepath.Join(archupDefault, "starship.toml"),
492		}	491	}