diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d0a195..1d9ec3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: - name: Install Cargo Make uses: davidB/rust-cargo-make@v1 - - name: Install Birli Dependencies + - name: Install Dependencies run: | cargo make install_deps diff --git a/Cargo.lock b/Cargo.lock index 6d0d58b..452569e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,6 @@ dependencies = [ "cc", "cxx", "cxx-build", - "unicode-width 0.1.11 (git+https://github.com/unicode-rs/unicode-width?tag=v0.1.11)", ] [[package]] @@ -30,7 +29,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] @@ -169,11 +168,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "git+https://github.com/unicode-rs/unicode-width?tag=v0.1.11#89424871950f91033de79cd06318d8c06d94df84" - [[package]] name = "winapi-util" version = "0.1.9" diff --git a/Cargo.toml b/Cargo.toml index 7f70b1e..0d50ec5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,4 +23,4 @@ cc = { version = "1.0.99", features = ["parallel"] } cxx-build = "~1.0.87" # unicode-width 0.1.14 uses library feature 'mixed_integer_ops', unstable in 1.63 -unicode-width = { git = "https://github.com/unicode-rs/unicode-width", tag = "v0.1.11" } +# unicode-width = { git = "https://github.com/unicode-rs/unicode-width", tag = "v0.1.11" } diff --git a/Makefile.toml b/Makefile.toml index 9f16d25..073fdbe 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -34,7 +34,14 @@ dependencies = ["linux_apt_get_essentials"] [tasks.linux_install_aoflagger] script = """ +# set sudo command if user is not root [ $(id -u) != 0 ] && export SUDO="sudo" || export SUDO="" + +# if ubuntu > 21.04, install through apt +$(source /etc/os-release && dpkg --compare-versions "$VERSION_ID" gt "21.04" &> /dev/null) \ + && $SUDO apt-get install -y aoflagger-dev \ + && exit 0 + $SUDO apt-get install -y \ casacore-data \ casacore-dev \ diff --git a/RELEASES.md b/RELEASES.md index 2a1c5f2..e482f4e 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -12,4 +12,4 @@ # Version 0.1.0 (2021-08-31) -- First release! \ No newline at end of file +- First release!