From 2b5867840b59799f3ff22f534cf3d7b050bfb480 Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 5 Apr 2025 10:01:55 +0000 Subject: [PATCH] fix: empty alias crash --- aliases.txt | 10 +++++----- src/aliases.go | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aliases.txt b/aliases.txt index 01094a9..9c1cc38 100644 --- a/aliases.txt +++ b/aliases.txt @@ -1,5 +1,5 @@ -ssh /static/ssh -pgp /static/pgp.asc -termux.sh https://git.gmoker.com/ange/termux/raw/branch/main/install.sh -dotfiles.sh -archinstall.sh +ssh /static/ssh +pgp /static/pgp.asc +termux.sh https://git.gmoker.com/ange/termux/raw/branch/main/install.sh +dotfiles.sh https://git.gmoker.com/ange/.dotfiles +arch.sh https://git.gmoker.com/ange/arch diff --git a/src/aliases.go b/src/aliases.go index d9fa210..93a9761 100644 --- a/src/aliases.go +++ b/src/aliases.go @@ -1,7 +1,6 @@ package main import ( - "bufio" "log" "os" "strings" @@ -10,16 +9,17 @@ import ( var ALIASES map[string]string func generateAliases() { - f, err := os.Open("aliases.txt") + f, err := os.ReadFile("aliases.txt") if err != nil { log.Fatal(err) } - sc := bufio.NewScanner(f) ALIASES = make(map[string]string) - for sc.Scan() { - sp := strings.Fields(sc.Text()) + for l := range strings.SplitSeq(string(f), "\n") { + sp := strings.Fields(l) - ALIASES[sp[0]] = sp[1] + if len(sp) == 2 { + ALIASES[sp[0]] = sp[1] + } } }