extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-08-14 00:58:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary set -m calls, speed up the local make acttest command, embed ReleaseVersion into the test server to fix the test failures on macos, and update install to be resistant to bashrc and zshrc not existing

Browse Source
This commit is contained in:
David Dworken
2022-04-19 21:05:54 -07:00
parent 0a03ce3407
commit 10ee085d4c
5 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/lib/lib.go
View File

@ -3,6 +3,7 @@ package lib
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
@ -370,15 +371,15 @@ func configureZshrc(homedir, binaryPath string) error {
return fmt.Errorf("failed to write config.zsh file: %v", err)
}
// Check if we need to configure the zshrc
bashrc, err := ioutil.ReadFile(path.Join(homedir, ".zshrc"))
zshIsConfigured, err := isZshConfigured(homedir)
if err != nil {
return fmt.Errorf("failed to read zshrc: %v", err)
return fmt.Errorf("failed to check ~/.zshrc: %v", err)
}
if strings.Contains(string(bashrc), "# Hishtory Config:") {
if zshIsConfigured {
return nil
}
// Add to zshrc
f, err := os.OpenFile(path.Join(homedir, ".zshrc"), os.O_APPEND|os.O_WRONLY, 0o644)
f, err := os.OpenFile(path.Join(homedir, ".zshrc"), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o644)
if err != nil {
return fmt.Errorf("failed to append to zshrc: %v", err)
}
@ -390,6 +391,18 @@ func configureZshrc(homedir, binaryPath string) error {
return nil
}
func isZshConfigured(homedir string) (bool, error) {
_, err := os.Stat(path.Join(homedir, ".zshrc"))
if errors.Is(err, os.ErrNotExist) {
return false, nil
}
bashrc, err := ioutil.ReadFile(path.Join(homedir, ".zshrc"))
if err != nil {
return false, fmt.Errorf("failed to read zshrc: %v", err)
}
return strings.Contains(string(bashrc), "# Hishtory Config:"), nil
}
func configureBashrc(homedir, binaryPath string) error {
// Create the file we're going to source in our bashrc. Do this no matter what in case there are updates to it.
bashConfigPath := path.Join(homedir, shared.HISHTORY_PATH, "config.sh")
@ -402,15 +415,15 @@ func configureBashrc(homedir, binaryPath string) error {
return fmt.Errorf("failed to write config.sh file: %v", err)
}
// Check if we need to configure the bashrc
bashrc, err := ioutil.ReadFile(path.Join(homedir, ".bashrc"))
bashIsConfigured, err := isBashConfigured(homedir)
if err != nil {
return fmt.Errorf("failed to read bashrc: %v", err)
return fmt.Errorf("failed to check ~/.bashrc: %v", err)
}
if strings.Contains(string(bashrc), "# Hishtory Config:") {
if bashIsConfigured {
return nil
}
// Add to bashrc
f, err := os.OpenFile(path.Join(homedir, ".bashrc"), os.O_APPEND|os.O_WRONLY, 0o644)
f, err := os.OpenFile(path.Join(homedir, ".bashrc"), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0o644)
if err != nil {
return fmt.Errorf("failed to append to bashrc: %v", err)
}
@ -422,6 +435,18 @@ func configureBashrc(homedir, binaryPath string) error {
return nil
}
func isBashConfigured(homedir string) (bool, error) {
_, err := os.Stat(path.Join(homedir, ".bashrc"))
if errors.Is(err, os.ErrNotExist) {
return false, nil
}
bashrc, err := ioutil.ReadFile(path.Join(homedir, ".bashrc"))
if err != nil {
return false, fmt.Errorf("failed to read bashrc: %v", err)
}
return strings.Contains(string(bashrc), "# Hishtory Config:"), nil
}
func installBinary(homedir string) (string, error) {
clientPath, err := exec.LookPath("hishtory")
if err != nil {