diff --git a/02-topgrade.sh b/02-topgrade.sh index d23db0a..576f472 100644 --- a/02-topgrade.sh +++ b/02-topgrade.sh @@ -18,12 +18,8 @@ topgrade_git_owner="r-darwish" topgrade_git_repo="topgrade" if [ ! -f "$topgrade_binary" ]; then echo "** topgrade binary missing, installing now" - newest_release=$(curl -sL https://api.github.com/repos/$topgrade_git_owner/$topgrade_git_repo/releases/latest | jq -r ".tag_name") - echo $newest_release newest_release_url=$(curl -sL https://api.github.com/repos/$topgrade_git_owner/$topgrade_git_repo/releases/latest | jq -r ".assets[].browser_download_url" | grep x86_64-unknown-linux-gnu.tar.gz) - echo $newest_release_url - wget "https://github.com/$topgrade_git_owner/$topgrade_git_repo/releases/download/v8.2.0/topgrade-v8.2.0-x86_64-unknown-linux-gnu.tar.gz" -O "$topgrade_tar" - # curl -s -L "https://github.com/$topgrade_git_user/$topgrade_git_repo/releases/latest" | egrep -o '/$topgrade_git_user/$topgrade_git_repo/releases/download/[0-9]*/[0-9]*-x86_64-unknown-linux-gnu.tar.gz' | wget --base=http://github.com/ -i - -O "$topgrade_tar" + wget $newest_release_url -O "$topgrade_tar" tar -xvf $topgrade_tar -C $topgrade_install_directory rm $topgrade_tar chmod +x $topgrade_binary @@ -32,9 +28,11 @@ else fi if [ ! -f "$topgrade_binary" ]; then echo "** topgrade binary not present at $topgrade_binary" +else + current_version=$($topgrade_binary --version | sed 's/[^0-9]*//g') + newest_release=$(curl -sL https://api.github.com/repos/$topgrade_git_owner/$topgrade_git_repo/releases/latest | jq -r ".tag_name" | sed 's/[^0-9]*//g') fi - echo "checking for topgrade confs" custom_topgrade_confs_path="/etc/topgrade" custom_topgrade_confs_git="https://git.deathbybandaid.net/deathbybandaid/topgrade.git" diff --git a/dependencies/sed.dep b/dependencies/sed.dep new file mode 100644 index 0000000..5a12022 --- /dev/null +++ b/dependencies/sed.dep @@ -0,0 +1 @@ +sed