From 61a8fb95e4ab4f017a783ec3a73c9aaa87bc9732 Mon Sep 17 00:00:00 2001 From: veeso Date: Wed, 17 Jul 2024 12:41:49 +0200 Subject: [PATCH] fix: removed support for RPM --- dist/build/linux-aarch64.sh | 10 ---------- dist/build/linux-x86_64.sh | 10 ---------- install.sh | 27 --------------------------- site/html/get-started.html | 10 +--------- site/html/updates.html | 15 +++++++++------ 5 files changed, 10 insertions(+), 62 deletions(-) diff --git a/dist/build/linux-aarch64.sh b/dist/build/linux-aarch64.sh index edf0637..9141428 100755 --- a/dist/build/linux-aarch64.sh +++ b/dist/build/linux-aarch64.sh @@ -21,7 +21,6 @@ fi # names ARM64_DEB_NAME="termscp-arm64_deb" -ARM64_RPM_NAME="termscp-arm64_rpm" docker run --rm --privileged multiarch/qemu-user-static --reset -p yes @@ -49,14 +48,5 @@ tar cvzf termscp-v${VERSION}-aarch64-unknown-linux-gnu.tar.gz termscp echo "Sha256 (homebrew aarch64): $(sha256sum termscp-v${VERSION}-aarch64-unknown-linux-gnu.tar.gz)" rm termscp cd - -# Build aarch64_centos7 -cd aarch64_centos7/ -docker buildx build --platform linux/arm64 $CACHE --build-arg branch=${BRANCH} --tag $ARM64_RPM_NAME . -cd - -mkdir -p ${PKGS_DIR}/rpm/ -docker run --name "$ARM64_RPM_NAME" -d "$ARM64_RPM_NAME" || docker start "$ARM64_RPM_NAME" -docker exec -it "$ARM64_RPM_NAME" bash -c ". \$HOME/.cargo/env && git fetch origin && git checkout origin/$BRANCH; cargo rpm init; cargo rpm build" -docker cp ${ARM64_RPM_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/aarch64/termscp-${VERSION}-1.el7.aarch64.rpm ${PKGS_DIR}/rpm/termscp-${VERSION}-1.aarch64.rpm -docker stop "$ARM64_RPM_NAME" exit $? diff --git a/dist/build/linux-x86_64.sh b/dist/build/linux-x86_64.sh index 45f116b..96125c6 100755 --- a/dist/build/linux-x86_64.sh +++ b/dist/build/linux-x86_64.sh @@ -21,7 +21,6 @@ fi # names X86_64_DEB_NAME="termscp-x86_64_deb" -X86_64_RPM_NAME="termscp-x86_64_rpm" set -e # Don't fail @@ -47,14 +46,5 @@ tar cvzf termscp-v${VERSION}-x86_64-unknown-linux-gnu.tar.gz termscp echo "Sha256 x86_64 (homebrew): $(sha256sum termscp-v${VERSION}-x86_64-unknown-linux-gnu.tar.gz)" rm termscp cd - -# Build x86_64_centos7 -cd x86_64_centos7/ -docker build $CACHE --build-arg branch=${BRANCH} --tag "$X86_64_RPM_NAME" . -cd - -mkdir -p ${PKGS_DIR}/rpm/ -docker run --name "$X86_64_RPM_NAME" -d "$X86_64_RPM_NAME" || docker start "$X86_64_RPM_NAME" -docker exec -it "$X86_64_RPM_NAME" bash -c ". \$HOME/.cargo/env && git fetch origin && git checkout origin/$BRANCH; cargo rpm init; cargo rpm build" -docker cp ${X86_64_RPM_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.el7.x86_64.rpm ${PKGS_DIR}/rpm/termscp-${VERSION}-1.x86_64.rpm -docker stop "$X86_64_RPM_NAME" exit $? diff --git a/install.sh b/install.sh index 34e91a9..8abc7a8 100755 --- a/install.sh +++ b/install.sh @@ -12,8 +12,6 @@ TERMSCP_VERSION="0.13.0" GITHUB_URL="https://github.com/veeso/termscp/releases/download/v${TERMSCP_VERSION}" DEB_URL_AMD64="${GITHUB_URL}/termscp_${TERMSCP_VERSION}_amd64.deb" DEB_URL_AARCH64="${GITHUB_URL}/termscp_${TERMSCP_VERSION}_arm64.deb" -RPM_URL_AMD64="${GITHUB_URL}/termscp-${TERMSCP_VERSION}-1.x86_64.rpm" -RPM_URL_AARCH64="${GITHUB_URL}/termscp-${TERMSCP_VERSION}-1.aarch64.rpm" PATH="$PATH:/usr/sbin" @@ -37,8 +35,6 @@ set_termscp_version() { GITHUB_URL="https://github.com/veeso/termscp/releases/download/v${TERMSCP_VERSION}" DEB_URL_AMD64="${GITHUB_URL}/termscp_${TERMSCP_VERSION}_amd64.deb" DEB_URL_AARCH64="${GITHUB_URL}/termscp_${TERMSCP_VERSION}_arm64.deb" - RPM_URL_AMD64="${GITHUB_URL}/termscp-${TERMSCP_VERSION}-1.x86_64.rpm" - RPM_URL_AARCH64="${GITHUB_URL}/termscp-${TERMSCP_VERSION}-1.aarch64.rpm" } info() { @@ -262,29 +258,6 @@ install_on_linux() { info "$msg" $sudo dpkg -i "${archive}" rm -f ${archive} - elif has rpm; then - case "${ARCH}" in - x86_64) RPM_URL="$RPM_URL_AMD64" ;; - aarch64) RPM_URL="$RPM_URL_AARCH64" ;; - *) try_with_cargo "we don't distribute packages for ${ARCH} at the moment" && return $? ;; - esac - info "Detected rpm on your system" - info "Installing ${GREEN}termscp${NO_COLOR} via RPM package" - archive=$(get_tmpfile "rpm") - download "${archive}" "${RPM_URL}" - info "Downloaded rpm package to ${archive}" - if test_writeable "/usr/bin"; then - sudo="" - msg="Installing ${GREEN}termscp${NO_COLOR}, please wait…" - else - warn "Root permissions are required to install ${GREEN}termscp${NO_COLOR}…" - elevate_priv - sudo="sudo" - msg="Installing ${GREEN}termscp${NO_COLOR} as root, please wait…" - fi - info "$msg" - $sudo rpm -U "${archive}" - rm -f ${archive} elif has brew; then install_with_brew else diff --git a/site/html/get-started.html b/site/html/get-started.html index 238ac40..b82dbbf 100644 --- a/site/html/get-started.html +++ b/site/html/get-started.html @@ -81,14 +81,6 @@ sudo dpkg -i termscp.deb Redhat derived users -
-

- On RedHat based distros, you can install termscp using the RPM - package via: -

- 
wget -O termscp.rpm https://github.com/veeso/termscp/releases/latest/download/termscp-0.13.0-1.x86_64.rpm
-sudo rpm -U termscp.rpm
-

Brew

@@ -169,4 +161,4 @@ sudo rpm -U termscp.rpm - + \ No newline at end of file diff --git a/site/html/updates.html b/site/html/updates.html index 65cc4a7..edf14ee 100644 --- a/site/html/updates.html +++ b/site/html/updates.html @@ -1,6 +1,7 @@ +

Keeping termscp up to date

@@ -8,7 +9,7 @@

 Why should you install - updates + updates

@@ -41,7 +42,8 @@

-

 GUI method

+

 GUI + method

The GUI method just consists in starting termscp with no options, you @@ -64,8 +66,8 @@

- If you have previously installed termscp via Deb/RPM package, you - may need to use the CLI method running termscp with sudo + If you have previously installed termscp via Deb package, you + may need to use the CLI method running termscp with sudo

@@ -73,7 +75,8 @@
-

 CLI method

+

 CLI + method

If you prefer, you can install a new update just using the dedicated @@ -94,4 +97,4 @@

- + \ No newline at end of file