From 4ad5cb905e07ccc65d70bc4f4e4aa0b8e10b35c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=E1=BA=A1m=20Th=C3=A0nh=20An?= Date: Fri, 15 Nov 2024 10:13:41 +0700 Subject: [PATCH 1/2] Remove GNU bash from scripts and workflows --- .github/workflows/release.yaml | 4 ++-- Makefile | 7 ++++--- scripts/build | 24 +++++++++++++++++++++++ scripts/build.bash | 32 ------------------------------ scripts/install | 36 ++++++++++++++++++++++++++++++++++ scripts/install.bash | 36 ---------------------------------- scripts/test | 18 +++++++++++++++++ scripts/test.bash | 25 ----------------------- 8 files changed, 84 insertions(+), 98 deletions(-) create mode 100644 scripts/build delete mode 100644 scripts/build.bash create mode 100644 scripts/install delete mode 100644 scripts/install.bash create mode 100644 scripts/test delete mode 100644 scripts/test.bash diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1ea460e3..6f6ca771 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,9 +15,9 @@ jobs: with: usesh: true prepare: | - pkg install -y bash gmake go gcc pkgconf libX11 libXtst gtk3 + pkg install -y go pkgconf libX11 libXtst gtk3 run: | - gmake test && gmake build + make test && make build Build-test-nix-flake: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 6139a89c..1c6851b4 100755 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ # CC=cc +BINSH=/bin/sh engine_name=bamboo engine_gui_name=ibus-setup-Bamboo.desktop @@ -37,10 +38,10 @@ tar_options_src=--transform "s/^\./$(pkg_name)-$(version)/" --exclude=.git --exc all: build build: - bash scripts/build.bash + $(BINSH) scripts/build test: - bash scripts/test.bash + $(BINSH) scripts/test clean: rm -f ibus-engine-bamboo @@ -52,7 +53,7 @@ clean: install: build - bash scripts/install.bash ${PREFIX} ${DESTDIR} + $(BINSH) scripts/install ${PREFIX} ${DESTDIR} uninstall: rm -rf $(DESTDIR)$(engine_dir) diff --git a/scripts/build b/scripts/build new file mode 100644 index 00000000..1ad280d9 --- /dev/null +++ b/scripts/build @@ -0,0 +1,24 @@ +# Ibus bamboo +ibus_e_name="ibus-engine-bamboo" +version="0.8.4" + +# Go flags +LDFLAGS="-w -s -X main.Version=${version}" + +# Go flags for FreeBSD +CGO_CFLAGS_FREEBSD="-I/usr/local/include -std=gnu99" +CGO_LDFLAGS_FREEBSD="-L/usr/local/lib -lX11 -lXtst -pthread" + +case $(uname) in + "Linux") CGO_ENABLED=1 \ + go build -o ${ibus_e_name} -ldflags "${LDFLAGS}" -mod=vendor + ;; + + "FreeBSD") CGO_ENABLED=1 \ + CGO_CFLAGS=${CGO_CFLAGS_FREEBSD} \ + CGO_LDFLAGS=${CGO_LDFLAGS_FREEBSD} \ + go build -o ${ibus_e_name} -ldflags "${LDFLAGS}" -mod=vendor + ;; + *) echo "Hiện tại chưa hỗ trợ hệ điều hành này!" + ;; +esac diff --git a/scripts/build.bash b/scripts/build.bash deleted file mode 100644 index 4f72708a..00000000 --- a/scripts/build.bash +++ /dev/null @@ -1,32 +0,0 @@ -# Ibus bamboo -ibus_e_name="ibus-engine-bamboo" -version="0.8.4" - -# Go flags -LDFLAGS="-w -s -X main.Version=${version}" - -# Go flags for FreeBSD -CGO_CFLAGS_FREEBSD="-I/usr/local/include -std=gnu99" -CGO_LDFLAGS_FREEBSD="-L/usr/local/lib -lX11 -lXtst -pthread" - -# Functions -build_linux() { - CGO_ENABLED=1 \ - go build -o ${ibus_e_name} -ldflags "${LDFLAGS}" -mod=vendor -} - -build_freebsd() { - CGO_ENABLED=1 \ - CGO_CFLAGS=${CGO_CFLAGS_FREEBSD} \ - CGO_LDFLAGS=${CGO_LDFLAGS_FREEBSD} \ - go build -o ${ibus_e_name} -ldflags "${LDFLAGS}" -mod=vendor -} - -# Main script -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - build_linux -elif [[ "$OSTYPE" == "freebsd"* ]]; then - build_freebsd -else - echo "Operating system is not supported currently!" -fi diff --git a/scripts/install b/scripts/install new file mode 100644 index 00000000..d10a9e2d --- /dev/null +++ b/scripts/install @@ -0,0 +1,36 @@ +PREFIX="$1" +DESTDIR="$2" + +engine_name="bamboo" +engine_gui_name="ibus-setup-Bamboo.desktop" +ibus_e_name="ibus-engine-${engine_name}" +pkg_name="ibus-${engine_name}" +version="0.8.4" + +engine_dir=${PREFIX}/share/${pkg_name} +ibus_dir=${PREFIX}/share/ibus + +# Main script +case $(uname) in + "Linux") mkdir -p ${DESTDIR}${engine_dir} \ + ${DESTDIR}${PREFIX}/lib/ibus-${engine_name} \ + ${DESTDIR}${ibus_dir}/component/ \ + ${DESTDIR}${PREFIX}/share/applications/ + cp -R -f icons data ${DESTDIR}${engine_dir} + cp -f ${ibus_e_name} ${DESTDIR}${PREFIX}/lib/ibus-${engine_name}/ + cp -f data/${engine_name}.xml ${DESTDIR}${ibus_dir}/component/ + cp -f data/${engine_gui_name} ${DESTDIR}${PREFIX}/share/applications/ + ;; + "FreeBSD") mkdir -p ${DESTDIR}${engine_dir} \ + ${DESTDIR}${PREFIX}/lib/ibus-${engine_name} \ + ${DESTDIR}${ibus_dir}/component/ \ + ${DESTDIR}${PREFIX}/share/applications/ + + cp -R -f icons data ${DESTDIR}${engine_dir} + cp -f ${ibus_e_name} ${DESTDIR}${PREFIX}/lib/ibus-${engine_name}/ + cp -f data/${engine_name}-freebsd.xml ${DESTDIR}${ibus_dir}/component/ + cp -f data/${engine_gui_name} ${DESTDIR}${PREFIX}/share/applications/ + ;; + *) echo "Hiện tại chưa hỗ trợ hệ điều hành này!" + ;; +esac diff --git a/scripts/install.bash b/scripts/install.bash deleted file mode 100644 index 4e706b44..00000000 --- a/scripts/install.bash +++ /dev/null @@ -1,36 +0,0 @@ -PREFIX="$1" -DESTDIR="$2" - -engine_name="bamboo" -engine_gui_name="ibus-setup-Bamboo.desktop" -ibus_e_name="ibus-engine-${engine_name}" -pkg_name="ibus-${engine_name}" -version="0.8.4" - -engine_dir=${PREFIX}/share/${pkg_name} -ibus_dir=${PREFIX}/share/ibus - -# Main script -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - mkdir -p ${DESTDIR}${engine_dir} - mkdir -p ${DESTDIR}${PREFIX}/lib/ibus-${engine_name} - mkdir -p ${DESTDIR}${ibus_dir}/component/ - mkdir -p ${DESTDIR}${PREFIX}/share/applications/ - - cp -R -f icons data ${DESTDIR}${engine_dir} - cp -f ${ibus_e_name} ${DESTDIR}${PREFIX}/lib/ibus-${engine_name}/ - cp -f data/${engine_name}.xml ${DESTDIR}${ibus_dir}/component/ - cp -f data/${engine_gui_name} ${DESTDIR}${PREFIX}/share/applications/ -elif [[ "$OSTYPE" == "freebsd"* ]]; then - mkdir -p ${DESTDIR}${engine_dir} - mkdir -p ${DESTDIR}${PREFIX}/lib/ibus-${engine_name} - mkdir -p ${DESTDIR}${ibus_dir}/component/ - mkdir -p ${DESTDIR}${PREFIX}/share/applications/ - - cp -R -f icons data ${DESTDIR}${engine_dir} - cp -f ${ibus_e_name} ${DESTDIR}${PREFIX}/lib/ibus-${engine_name}/ - cp -f data/${engine_name}-freebsd.xml ${DESTDIR}${ibus_dir}/component/ - cp -f data/${engine_gui_name} ${DESTDIR}${PREFIX}/share/applications/ -else - echo "Operating system is not supported currently!" -fi diff --git a/scripts/test b/scripts/test new file mode 100644 index 00000000..8632594f --- /dev/null +++ b/scripts/test @@ -0,0 +1,18 @@ +# Go flags for FreeBSD +CGO_CFLAGS_FREEBSD="-I/usr/local/include -std=gnu99" +CGO_LDFLAGS_FREEBSD="-L/usr/local/lib -lX11 -lXtst -pthread" + +# Functions +case $(uname) in + "Linux") CGO_ENABLED=1 \ + go test . -mod=vendor + ;; + "FreeBSD") CGO_ENABLED=1 \ + CGO_CFLAGS=${CGO_CFLAGS_FREEBSD} \ + CGO_LDFLAGS=${CGO_LDFLAGS_FREEBSD} \ + go test . -mod=vendor + ;; + *) + echo "Hiện tại chưa hỗ trợ hệ điều hành này!" + ;; +esac diff --git a/scripts/test.bash b/scripts/test.bash deleted file mode 100644 index 2d599bec..00000000 --- a/scripts/test.bash +++ /dev/null @@ -1,25 +0,0 @@ -# Go flags for FreeBSD -CGO_CFLAGS_FREEBSD="-I/usr/local/include -std=gnu99" -CGO_LDFLAGS_FREEBSD="-L/usr/local/lib -lX11 -lXtst -pthread" - -# Functions -test_linux() { - CGO_ENABLED=1 \ - go test . -mod=vendor -} - -test_freebsd() { - CGO_ENABLED=1 \ - CGO_CFLAGS=${CGO_CFLAGS_FREEBSD} \ - CGO_LDFLAGS=${CGO_LDFLAGS_FREEBSD} \ - go test . -mod=vendor -} - -# Main script -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - test_linux -elif [[ "$OSTYPE" == "freebsd"* ]]; then - test_freebsd -else - echo "Operating system is not supported currently!" -fi From 3b00f21b0e6d6223eaa37789923daf2c8ce52e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=E1=BA=A1m=20Th=C3=A0nh=20An?= <44942508+tch69@users.noreply.github.com> Date: Sat, 16 Nov 2024 21:59:44 +0700 Subject: [PATCH 2/2] =?UTF-8?q?Makefile:=20thay=20BINSH=20b=E1=BA=B1ng=20S?= =?UTF-8?q?HELL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1c6851b4..fa25d66f 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ # CC=cc -BINSH=/bin/sh +SHELL=sh engine_name=bamboo engine_gui_name=ibus-setup-Bamboo.desktop @@ -38,10 +38,10 @@ tar_options_src=--transform "s/^\./$(pkg_name)-$(version)/" --exclude=.git --exc all: build build: - $(BINSH) scripts/build + $(SHELL) scripts/build test: - $(BINSH) scripts/test + $(SHELL) scripts/test clean: rm -f ibus-engine-bamboo @@ -53,7 +53,7 @@ clean: install: build - $(BINSH) scripts/install ${PREFIX} ${DESTDIR} + $(SHELL) scripts/install ${PREFIX} ${DESTDIR} uninstall: rm -rf $(DESTDIR)$(engine_dir)