From 55f06cb7a9323c0278602b7d262e64b5844e1d4e Mon Sep 17 00:00:00 2001 From: Zack Date: Wed, 3 Jul 2024 15:26:28 +0800 Subject: [PATCH] chore: make bash script more portable (#5679) --- frontend/appflowy_web_app/start.sh | 2 +- .../code_generation/flowy_icons/generate_flowy_icons.sh | 2 +- frontend/scripts/code_generation/freezed/generate_freezed.sh | 2 +- frontend/scripts/code_generation/generate.sh | 2 +- .../code_generation/language_files/generate_language_files.sh | 2 +- frontend/scripts/flatpack-buildfiles/launcher.sh | 2 +- frontend/scripts/install_dev_env/install_ios.sh | 2 +- frontend/scripts/install_dev_env/install_linux.sh | 2 +- frontend/scripts/install_dev_env/install_macos.sh | 4 ++-- frontend/scripts/install_dev_env/install_windows.sh | 2 +- .../scripts/linux_distribution/appimage/build_appimage.sh | 2 +- frontend/scripts/linux_distribution/deb/DEBIAN/postinst | 2 +- frontend/scripts/linux_distribution/deb/DEBIAN/postrm | 2 +- frontend/scripts/linux_distribution/deb/build_deb.sh | 2 +- frontend/scripts/linux_distribution/packaging/launcher.sh | 2 +- frontend/scripts/linux_installer/postinst | 2 +- frontend/scripts/linux_installer/postrm | 4 ++-- frontend/scripts/makefile/web.toml | 4 ++-- frontend/scripts/tool/update_collab_rev.sh | 2 +- frontend/scripts/tool/update_collab_source.sh | 4 ++-- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/frontend/appflowy_web_app/start.sh b/frontend/appflowy_web_app/start.sh index 2c0961565a..7fb7709ba8 100644 --- a/frontend/appflowy_web_app/start.sh +++ b/frontend/appflowy_web_app/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash diff --git a/frontend/scripts/code_generation/flowy_icons/generate_flowy_icons.sh b/frontend/scripts/code_generation/flowy_icons/generate_flowy_icons.sh index 30538def96..f4da25fb58 100755 --- a/frontend/scripts/code_generation/flowy_icons/generate_flowy_icons.sh +++ b/frontend/scripts/code_generation/flowy_icons/generate_flowy_icons.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Generating flowy icon files" diff --git a/frontend/scripts/code_generation/freezed/generate_freezed.sh b/frontend/scripts/code_generation/freezed/generate_freezed.sh index 24c90650d2..01692fe7ee 100755 --- a/frontend/scripts/code_generation/freezed/generate_freezed.sh +++ b/frontend/scripts/code_generation/freezed/generate_freezed.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Store the current working directory original_dir=$(pwd) diff --git a/frontend/scripts/code_generation/generate.sh b/frontend/scripts/code_generation/generate.sh index f71ceba2df..cfe7a12b60 100755 --- a/frontend/scripts/code_generation/generate.sh +++ b/frontend/scripts/code_generation/generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Store the current working directory original_dir=$(pwd) diff --git a/frontend/scripts/code_generation/language_files/generate_language_files.sh b/frontend/scripts/code_generation/language_files/generate_language_files.sh index 8aa403d1f2..ec5a14836e 100755 --- a/frontend/scripts/code_generation/language_files/generate_language_files.sh +++ b/frontend/scripts/code_generation/language_files/generate_language_files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Generating language files" diff --git a/frontend/scripts/flatpack-buildfiles/launcher.sh b/frontend/scripts/flatpack-buildfiles/launcher.sh index c7e7b9ee4a..24b4fdbea4 100644 --- a/frontend/scripts/flatpack-buildfiles/launcher.sh +++ b/frontend/scripts/flatpack-buildfiles/launcher.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash gdbus call --session --dest io.appflowy.AppFlowy \ --object-path /io/appflowy/AppFlowy/Object \ --method io.appflowy.AppFlowy.Open "['$1']" {} diff --git a/frontend/scripts/install_dev_env/install_ios.sh b/frontend/scripts/install_dev_env/install_ios.sh index 653eb8f1b3..5f27fff913 100644 --- a/frontend/scripts/install_dev_env/install_ios.sh +++ b/frontend/scripts/install_dev_env/install_ios.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash YELLOW="\e[93m" GREEN="\e[32m" diff --git a/frontend/scripts/install_dev_env/install_linux.sh b/frontend/scripts/install_dev_env/install_linux.sh index b02b31d62c..7ec91019ec 100755 --- a/frontend/scripts/install_dev_env/install_linux.sh +++ b/frontend/scripts/install_dev_env/install_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash YELLOW="\e[93m" GREEN="\e[32m" diff --git a/frontend/scripts/install_dev_env/install_macos.sh b/frontend/scripts/install_dev_env/install_macos.sh index 8613b904c6..5bb83c35ad 100755 --- a/frontend/scripts/install_dev_env/install_macos.sh +++ b/frontend/scripts/install_dev_env/install_macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash YELLOW="\e[93m" GREEN="\e[32m" @@ -90,4 +90,4 @@ cargo install --force duckscript_cli # Check prerequisites printMessage "Checking prerequisites." -cargo make appflowy-flutter-deps-tools \ No newline at end of file +cargo make appflowy-flutter-deps-tools diff --git a/frontend/scripts/install_dev_env/install_windows.sh b/frontend/scripts/install_dev_env/install_windows.sh index 1d68a677ae..45182df3c0 100644 --- a/frontend/scripts/install_dev_env/install_windows.sh +++ b/frontend/scripts/install_dev_env/install_windows.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash YELLOW="\e[93m" GREEN="\e[32m" diff --git a/frontend/scripts/linux_distribution/appimage/build_appimage.sh b/frontend/scripts/linux_distribution/appimage/build_appimage.sh index a7e4d1b11b..73deb45edd 100644 --- a/frontend/scripts/linux_distribution/appimage/build_appimage.sh +++ b/frontend/scripts/linux_distribution/appimage/build_appimage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash VERSION=$1 diff --git a/frontend/scripts/linux_distribution/deb/DEBIAN/postinst b/frontend/scripts/linux_distribution/deb/DEBIAN/postinst index 56186649d4..bf2f79fa97 100755 --- a/frontend/scripts/linux_distribution/deb/DEBIAN/postinst +++ b/frontend/scripts/linux_distribution/deb/DEBIAN/postinst @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -e /usr/bin/AppFlowy ]; then echo "Symlink already exists, skipping." else diff --git a/frontend/scripts/linux_distribution/deb/DEBIAN/postrm b/frontend/scripts/linux_distribution/deb/DEBIAN/postrm index f815d1bb5c..59a680e767 100755 --- a/frontend/scripts/linux_distribution/deb/DEBIAN/postrm +++ b/frontend/scripts/linux_distribution/deb/DEBIAN/postrm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -e /usr/bin/AppFlowy ]; then rm /usr/bin/AppFlowy rm /usr/bin/AppFlowyLauncher.sh diff --git a/frontend/scripts/linux_distribution/deb/build_deb.sh b/frontend/scripts/linux_distribution/deb/build_deb.sh index 35fe9dbbaf..42fbf7346d 100644 --- a/frontend/scripts/linux_distribution/deb/build_deb.sh +++ b/frontend/scripts/linux_distribution/deb/build_deb.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash LINUX_RELEASE_PRODUCTION=$1 VERSION=$2 diff --git a/frontend/scripts/linux_distribution/packaging/launcher.sh b/frontend/scripts/linux_distribution/packaging/launcher.sh index c7e7b9ee4a..24b4fdbea4 100644 --- a/frontend/scripts/linux_distribution/packaging/launcher.sh +++ b/frontend/scripts/linux_distribution/packaging/launcher.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash gdbus call --session --dest io.appflowy.AppFlowy \ --object-path /io/appflowy/AppFlowy/Object \ --method io.appflowy.AppFlowy.Open "['$1']" {} diff --git a/frontend/scripts/linux_installer/postinst b/frontend/scripts/linux_installer/postinst index 4f495f86a2..83e1a1043e 100644 --- a/frontend/scripts/linux_installer/postinst +++ b/frontend/scripts/linux_installer/postinst @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -e /usr/local/bin/AppFlowy ]; then echo "Symlink already exists, skipping." else diff --git a/frontend/scripts/linux_installer/postrm b/frontend/scripts/linux_installer/postrm index 53304b1b48..7927bc56e5 100644 --- a/frontend/scripts/linux_installer/postrm +++ b/frontend/scripts/linux_installer/postrm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -e /usr/local/bin/appflowy ]; then rm /usr/local/bin/appflowy -fi \ No newline at end of file +fi diff --git a/frontend/scripts/makefile/web.toml b/frontend/scripts/makefile/web.toml index 1d40d9da17..d00dbaf8d1 100644 --- a/frontend/scripts/makefile/web.toml +++ b/frontend/scripts/makefile/web.toml @@ -2,7 +2,7 @@ script_runner = "bash" script = [ """ - #!/bin/bash + #!/usr/bin/env bash BASE_DIR=$(pwd) crates=("lib-dispatch" "flowy-encrypt" "lib-infra" "flowy-notification" "flowy-date" "flowy-error" "collab-integrate" "flowy-document") @@ -56,4 +56,4 @@ script = [""" end end """] -script_runner = "@duckscript" \ No newline at end of file +script_runner = "@duckscript" diff --git a/frontend/scripts/tool/update_collab_rev.sh b/frontend/scripts/tool/update_collab_rev.sh index fabc71160a..469974cdb2 100755 --- a/frontend/scripts/tool/update_collab_rev.sh +++ b/frontend/scripts/tool/update_collab_rev.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Ensure a new revision ID is provided if [ "$#" -ne 1 ]; then diff --git a/frontend/scripts/tool/update_collab_source.sh b/frontend/scripts/tool/update_collab_source.sh index 094e5caf14..fcf8ae9744 100755 --- a/frontend/scripts/tool/update_collab_source.sh +++ b/frontend/scripts/tool/update_collab_source.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Paths to your Cargo.toml files REPO_PATH="./AppFlowy-Collab" @@ -38,4 +38,4 @@ fi # Switch dependencies in both Cargo.toml files switch_deps "$CARGO_TOML_1" "$REPO_RELATIVE_PATH_1" -switch_deps "$CARGO_TOML_2" "$REPO_RELATIVE_PATH_2" \ No newline at end of file +switch_deps "$CARGO_TOML_2" "$REPO_RELATIVE_PATH_2"