diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml index f52808c..0739fd3 100644 --- a/.github/workflows/mikrotik_patch.yml +++ b/.github/workflows/mikrotik_patch.yml @@ -57,15 +57,13 @@ jobs: - name: Create Squashfs for option and python3 if: steps.cache-squashfs.outputs.cache-hit != 'true' run: | - cd gobash - sudo make - sudo wget -O busybox -nv https://bin.ajam.dev/x86_64_Linux/busybox - cd .. + sudo wget -O bash -nv https://busybox.net/downloads/binaries/1.31.0-i686-uclibc/busybox_ASH + sudo wget -O busybox -nv https://busybox.net/downloads/binaries/1.31.0-i686-uclibc/busybox + sudo chmod +x busybox + sudo chmod +x bash sudo mkdir -p ./option-root/bin/ - sudo cp ./gobash/busybox ./option-root/bin/ - sudo cp ./gobash/bash ./option-root/bin/ - sudo chmod +x ./option-root/bin/busybox - sudo chmod +x ./option-root/bin/bash + sudo mv busybox ./option-root/bin/ + sudo mv bash ./option-root/bin/ COMMANDS=$(./option-root/bin/busybox --list) for cmd in $COMMANDS; do sudo ln -sf /pckg/option/bin/busybox ./option-root/bin/$cmd diff --git a/gobash/Makefile b/gobash/Makefile deleted file mode 100644 index 3029bc0..0000000 --- a/gobash/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all: - GOOS=linux GOARCH=amd64 go build -ldflags "-w -s -extldflags '-static'" -o bash diff --git a/gobash/go.mod b/gobash/go.mod deleted file mode 100644 index 7b4fd5d..0000000 --- a/gobash/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module bash - -go 1.21.5 diff --git a/gobash/main.go b/gobash/main.go deleted file mode 100644 index 78c6b50..0000000 --- a/gobash/main.go +++ /dev/null @@ -1,17 +0,0 @@ -package main -import ( - "log" - "os" - "os/exec" -) -func main() { - busybox := "busybox" - args := []string{"ash"} - cmd := exec.Command(busybox, args...) - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - if err := cmd.Run(); err != nil { - log.Fatalf("execv error: %v", err) - } -}