From 9a311a233a74a348a98fb5f48032b5d3c231eabd Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Thu, 20 Feb 2020 15:39:21 -0800 Subject: [PATCH] Change bash to sh for cross compatibility and add brewinstall rule to Makefile --- Makefile | 5 +++++ pak.go | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 54275ac..7a1cf4a 100644 --- a/Makefile +++ b/Makefile @@ -23,3 +23,8 @@ pacinstall: plugins/pacman/pak.cfg pak aptitude: plugins/aptitude/pak.cfg pak install -Dm644 plugins/aptitude/pak.cfg $(DESTDIR)/etc/pak.cfg install -Dm755 pak $(DESTDIR)/usr/bin/pak + +brewinstall: plugins/brew/pak.cfg pak + mount -uw / + install -m644 plugins/brew/pak.cfg $(DESTDIR)/etc/pak.cfg + install -m755 pak $(DESTDIR)/usr/bin/pak \ No newline at end of file diff --git a/pak.go b/pak.go index 89f239d..d0152a2 100644 --- a/pak.go +++ b/pak.go @@ -244,7 +244,7 @@ func main() { if useRootBool { cmdArr := []string{rootCommand, packageManagerCommand, similarTo[0], strings.Join(args[1:], " ")} cmdStr := strings.Join(cmdArr, " ") - command := exec.Command("bash", "-c", cmdStr) + command := exec.Command("sh", "-c", cmdStr) command.Stdout = os.Stdout command.Stdin = os.Stdin command.Stderr = os.Stderr @@ -256,7 +256,7 @@ func main() { } else { cmdArr :=[]string{packageManagerCommand, similarTo[0], strings.Join(args[1:], " ")} cmdStr := strings.Join(cmdArr, " ") - command := exec.Command("bash", "-c", cmdStr) + command := exec.Command("sh", "-c", cmdStr) command.Stdout = os.Stdout command.Stdin = os.Stdin command.Stderr = os.Stderr @@ -275,7 +275,7 @@ func main() { if useRootBool { cmdArr :=[]string{rootCommand, packageManagerCommand, similarTo[0]} cmdStr := strings.Join(cmdArr, " ") - command := exec.Command("bash", "-c", cmdStr) + command := exec.Command("sh", "-c", cmdStr) command.Stdout = os.Stdout command.Stdin = os.Stdin command.Stderr = os.Stderr @@ -287,7 +287,7 @@ func main() { } else { cmdArr :=[]string{packageManagerCommand, similarTo[0]} cmdStr := strings.Join(cmdArr, " ") - command := exec.Command("bash", "-c", cmdStr) + command := exec.Command("sh", "-c", cmdStr) command.Stdout = os.Stdout command.Stdin = os.Stdin command.Stderr = os.Stderr