mirror of
https://github.com/denisidoro/navi.git
synced 2026-01-23 02:14:19 +00:00
Minor fixes (#221)
This commit is contained in:
Denis Isidoro
GitHub
parent
e6b7c2f358
commit
06eae50613
11 changed files with 109 additions and 83 deletions
|
|
@ -8,37 +8,37 @@ source "${NAVI_HOME}/scripts/install"
|
|||
|
||||
release() {
|
||||
|
||||
TAR_DIR="${NAVI_HOME}/target/tar"
|
||||
TAR_DIR="${NAVI_HOME}/target/tar"
|
||||
|
||||
target="${1:-}"
|
||||
if [[ $target == *"osx"* ]]; then
|
||||
echoerr "OSX cross-compile is impossible. Fallbacking to cargo..."
|
||||
target=""
|
||||
fi
|
||||
target="${1:-}"
|
||||
if [[ $target == *"osx"* ]]; then
|
||||
echoerr "OSX cross-compile is impossible. Fallbacking to cargo..."
|
||||
target=""
|
||||
fi
|
||||
|
||||
cd "$NAVI_HOME"
|
||||
cd "$NAVI_HOME"
|
||||
|
||||
rm -rf "${NAVI_HOME}/target" 2> /dev/null || true
|
||||
rm -rf "${NAVI_HOME}/target" 2> /dev/null || true
|
||||
|
||||
if [ -n "$target" ]; then
|
||||
cargo install cross 2> /dev/null || true
|
||||
cross build --release --locked --target "$target"
|
||||
bin_folder="${target}/release"
|
||||
else
|
||||
cargo build --release --locked
|
||||
bin_folder="release"
|
||||
fi
|
||||
if [ -n "$target" ]; then
|
||||
cargo install cross 2> /dev/null || true
|
||||
cross build --release --locked --target "$target"
|
||||
bin_folder="${target}/release"
|
||||
else
|
||||
cargo build --release --locked
|
||||
bin_folder="release"
|
||||
fi
|
||||
|
||||
bin_path="${NAVI_HOME}/target/${bin_folder}/navi"
|
||||
chmod +x "$bin_path"
|
||||
mkdir -p "$TAR_DIR" 2> /dev/null || true
|
||||
bin_path="${NAVI_HOME}/target/${bin_folder}/navi"
|
||||
chmod +x "$bin_path"
|
||||
mkdir -p "$TAR_DIR" 2> /dev/null || true
|
||||
|
||||
cp -r "${NAVI_HOME}/cheats" "$TAR_DIR"
|
||||
cp -r "${NAVI_HOME}/shell" "$TAR_DIR"
|
||||
cp "$bin_path" "$TAR_DIR"
|
||||
cp -r "${NAVI_HOME}/cheats" "$TAR_DIR"
|
||||
cp -r "${NAVI_HOME}/shell" "$TAR_DIR"
|
||||
cp "$bin_path" "$TAR_DIR"
|
||||
|
||||
cd "${NAVI_HOME}/target/tar"
|
||||
tar -czf navi.tar.gz *
|
||||
cd "${NAVI_HOME}/target/tar"
|
||||
tar -czf navi.tar.gz *
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -46,5 +46,5 @@ cmd="$1"
|
|||
shift
|
||||
|
||||
case "$cmd" in
|
||||
"release") release "$@" ;;
|
||||
"release") release "$@" ;;
|
||||
esac
|
||||
|
|
|
|||
38
scripts/brew
38
scripts/brew
|
|
@ -7,36 +7,36 @@ export NAVI_HOME="$(cd "$(dirname "$0")/.." && pwd)"
|
|||
source "${NAVI_HOME}/scripts/install"
|
||||
|
||||
gen_formula() {
|
||||
version="$(latest_version_released)"
|
||||
header "version: ${version}"
|
||||
version="$(latest_version_released)"
|
||||
header "version: ${version}"
|
||||
|
||||
header "sha_for x86_64-unknown-linux-musl..."
|
||||
sha_linux="$(sha_for_asset_on_github "$version" "x86_64-unknown-linux-musl")"
|
||||
header "sha_for x86_64-unknown-linux-musl..."
|
||||
sha_linux="$(sha_for_asset_on_github "$version" "x86_64-unknown-linux-musl")"
|
||||
|
||||
header "sha_for x86_64-osx..."
|
||||
sha_osx="$(sha_for_asset_on_github "$version" "x86_64-osx")"
|
||||
header "sha_for x86_64-osx..."
|
||||
sha_osx="$(sha_for_asset_on_github "$version" "x86_64-osx")"
|
||||
|
||||
header "rb..."
|
||||
curl -s https://raw.githubusercontent.com/denisidoro/homebrew-tools/master/navirs.rb \
|
||||
| sed -E "s/version ['\"].*/version '${version}'/" \
|
||||
| awk '!x{x=sub("sha256","sha_osx")}7' \
|
||||
| awk '!x{x=sub("sha256","sha_linux")}7' \
|
||||
| sed -E "s/sha_osx.*/sha256 \"${sha_osx}\"/" \
|
||||
| sed -E "s/sha_linux.*/sha256 \"${sha_linux}\"/"
|
||||
header "rb..."
|
||||
curl -s https://raw.githubusercontent.com/denisidoro/homebrew-tools/master/navirs.rb \
|
||||
| sed -E "s/version ['\"].*/version '${version}'/" \
|
||||
| awk '!x{x=sub("sha256","sha_osx")}7' \
|
||||
| awk '!x{x=sub("sha256","sha_linux")}7' \
|
||||
| sed -E "s/sha_osx.*/sha256 \"${sha_osx}\"/" \
|
||||
| sed -E "s/sha_linux.*/sha256 \"${sha_linux}\"/"
|
||||
}
|
||||
|
||||
gen_sha() {
|
||||
version="${1:-$(latest_version_released)}"
|
||||
header "version: ${version}"
|
||||
version="${1:-$(latest_version_released)}"
|
||||
header "version: ${version}"
|
||||
|
||||
header "sha_for source..."
|
||||
sha_for_asset_on_github "$version"
|
||||
header "sha_for source..."
|
||||
sha_for_asset_on_github "$version"
|
||||
}
|
||||
|
||||
cmd="$1"
|
||||
shift
|
||||
|
||||
case "$cmd" in
|
||||
"formula") gen_formula "$@" ;;
|
||||
"sha") gen_sha "$@" ;;
|
||||
"formula") gen_formula "$@" ;;
|
||||
"sha") gen_sha "$@" ;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@ export NAVI_HOME="$(cd "$(dirname "$0")/.." && pwd)"
|
|||
cd "$NAVI_HOME"
|
||||
|
||||
docker run \
|
||||
-e HOMEBREW_NO_AUTO_UPDATE=1 \
|
||||
-it linuxbrew/alpine \
|
||||
bash -c 'brew install denisidoro/tools/navirs; bash'
|
||||
-e HOMEBREW_NO_AUTO_UPDATE=1 \
|
||||
-it linuxbrew/alpine \
|
||||
bash -c 'brew install denisidoro/tools/navirs; bash'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,16 @@
|
|||
set -euo pipefail
|
||||
|
||||
export NAVI_HOME="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
source "${NAVI_HOME}/scripts/install"
|
||||
|
||||
header "Cargo nighly fix..."
|
||||
cargo +nightly fix --clippy -Z unstable-options 2> /dev/null || true
|
||||
|
||||
header "Cargo fix..."
|
||||
cargo fix 2> /dev/null || true
|
||||
|
||||
header "Cargo fmt..."
|
||||
cargo fmt 2> /dev/null || true
|
||||
|
||||
header "dot code beautify..."
|
||||
find scripts -type f | xargs -I% dot code beautify 2> /dev/null || true
|
||||
|
|
@ -60,14 +60,14 @@ latest_version_released() {
|
|||
}
|
||||
|
||||
asset_url() {
|
||||
local -r version="$1"
|
||||
local -r variant="${2:-}"
|
||||
|
||||
if [[ -n "$variant" ]]; then
|
||||
echo "https://github.com/denisidoro/navi/releases/download/v${version}/navi-${variant}.tar.gz"
|
||||
else
|
||||
echo "https://github.com/denisidoro/navi/archive/v${version}.tar.gz"
|
||||
fi
|
||||
local -r version="$1"
|
||||
local -r variant="${2:-}"
|
||||
|
||||
if [[ -n "$variant" ]]; then
|
||||
echo "https://github.com/denisidoro/navi/releases/download/v${version}/navi-${variant}.tar.gz"
|
||||
else
|
||||
echo "https://github.com/denisidoro/navi/archive/v${version}.tar.gz"
|
||||
fi
|
||||
}
|
||||
|
||||
download_asset() {
|
||||
|
|
@ -83,8 +83,8 @@ download_asset() {
|
|||
}
|
||||
|
||||
sha_for_asset_on_github() {
|
||||
local -r url="$(asset_url "$@")"
|
||||
curl -sL "$url" | sha256 | awk '{print $1}'
|
||||
local -r url="$(asset_url "$@")"
|
||||
curl -sL "$url" | sha256 | awk '{print $1}'
|
||||
}
|
||||
|
||||
get_target() {
|
||||
|
|
@ -132,7 +132,7 @@ install_navi() {
|
|||
make install
|
||||
|
||||
else
|
||||
no_binary_warning
|
||||
no_binary_warning
|
||||
echoerr "You don't have the necessary tools to build it"
|
||||
echoerr "Please open an issue at https://github.com/denisidoro/navi"
|
||||
echoerr "Aborting..."
|
||||
|
|
|
|||
20
scripts/make
20
scripts/make
|
|
@ -8,23 +8,23 @@ export NAVI_HOME="$(cd "$(dirname "$0")/.." && pwd)"
|
|||
source "${NAVI_HOME}/scripts/install"
|
||||
|
||||
install() {
|
||||
export SOURCE_DIR="${SOURCE_DIR:-"$(get_source_dir)"}"
|
||||
export BIN_DIR="${BIN_DIR:-"$(get_bin_dir)"}"
|
||||
echoerr "The final binary will be available at ${BIN_DIR}/navi..."
|
||||
"${NAVI_HOME}/scripts/action" release
|
||||
ln -s "${NAVI_HOME}/target/tar/navi" "${BIN_DIR}/navi"
|
||||
export SOURCE_DIR="${SOURCE_DIR:-"$(get_source_dir)"}"
|
||||
export BIN_DIR="${BIN_DIR:-"$(get_bin_dir)"}"
|
||||
echoerr "The final binary will be available at ${BIN_DIR}/navi..."
|
||||
"${NAVI_HOME}/scripts/action" release
|
||||
ln -s "${NAVI_HOME}/target/tar/navi" "${BIN_DIR}/navi"
|
||||
}
|
||||
|
||||
uninstall() {
|
||||
export SOURCE_DIR="${SOURCE_DIR:-"$(get_source_dir)"}"
|
||||
rm -rf "${NAVI_HOME}/target"
|
||||
rm "$SOURCE_DIR"
|
||||
export SOURCE_DIR="${SOURCE_DIR:-"$(get_source_dir)"}"
|
||||
rm -rf "${NAVI_HOME}/target"
|
||||
rm "$SOURCE_DIR"
|
||||
}
|
||||
|
||||
cmd="$1"
|
||||
shift
|
||||
|
||||
case "$cmd" in
|
||||
"install") install "$@" ;;
|
||||
"uninstall") uninstall "$@" ;;
|
||||
"install") install "$@" ;;
|
||||
"uninstall") uninstall "$@" ;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue