From a13663e5e9dde110aa5548530c4e0ee353d9c990 Mon Sep 17 00:00:00 2001 From: Christian Visintin Date: Fri, 12 May 2023 17:06:27 +0200 Subject: [PATCH] Brew Linux support (#185) * feat: brew linux and arm installation * fix: updated website refs to termscp.veeso.dev * feat: added brew installation to website --- README.md | 12 ++-- dist/build/freebsd.sh | 2 +- dist/build/linux-aarch64.sh | 1 + dist/build/linux-x86_64.sh | 1 + docs/de/README.md | 12 ++-- docs/es/README.md | 12 ++-- docs/fr/README.md | 12 ++-- docs/it/README.md | 12 ++-- docs/zh-CN/README.md | 12 ++-- install.sh | 36 +++++----- site/html/get-started.html | 129 ++++++++++++------------------------ site/html/updates.html | 2 +- 12 files changed, 101 insertions(+), 142 deletions(-) diff --git a/README.md b/README.md index 27b267b..28486a3 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@

~ A feature rich terminal file transfer ~

- Website + Website · - Installation + Installation · - User manual + User manual

@@ -62,7 +62,7 @@ />

-

Developed by @veeso

+

Developed by @veeso

Current version: 0.12.0 (19/04/2023)

@@ -178,7 +178,7 @@ NetBSD users can install termscp from the official repositories. pkgin install termscp ``` -For more information or other platforms, please visit [veeso.github.io](https://veeso.github.io/termscp/#get-started) to view all installation methods. +For more information or other platforms, please visit [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started) to view all installation methods. ⚠️ If you're looking on how to update termscp just run termscp from CLI with: `(sudo) termscp --update` ⚠️ @@ -223,7 +223,7 @@ You can make a donation with one of these platforms: ## User manual 📚 -The user manual can be found on the [termscp's website](https://veeso.github.io/termscp/#user-manual) or on [Github](docs/man.md). +The user manual can be found on the [termscp's website](https://termscp.veeso.dev/termscp/#user-manual) or on [Github](docs/man.md). --- diff --git a/dist/build/freebsd.sh b/dist/build/freebsd.sh index 68aaa4e..b8fc140 100755 --- a/dist/build/freebsd.sh +++ b/dist/build/freebsd.sh @@ -39,7 +39,7 @@ echo -e "desc: <~ Eine funktionsreiche Terminal-Dateiübertragung ~

- Webseite + Webseite · - Installation + Installation · - Benutzerhandbuch + Benutzerhandbuch

@@ -62,7 +62,7 @@ />

-

Entwickelt von @veeso

+

Entwickelt von @veeso

Aktuelle Version: 0.12.0 (19/04/2023)

@@ -175,7 +175,7 @@ Wenn Sie ein Windows-Benutzer sind, können Sie termscp mit [Chocolatey](https:/ choco install termscp ``` -Für weitere Informationen oder andere Plattformen besuchen Sie bitte [veeso.github.io](https://veeso.github.io/termscp/#get-started), um alle Installationsmethoden anzuzeigen. +Für weitere Informationen oder andere Plattformen besuchen Sie bitte [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started), um alle Installationsmethoden anzuzeigen. ⚠️ Wenn Sie wissen möchten, wie Sie termscp aktualisieren können, führen Sie einfach termscp über die CLI aus mit: `(sudo) termscp --update` ⚠️ @@ -221,7 +221,7 @@ Sie können mit einer dieser Plattformen spenden: ## User manual 📚 -Das Benutzerhandbuch finden Sie auf der [termscp-Website](https://veeso.github.io/termscp/#user-manual) oder auf [Github](man.md). +Das Benutzerhandbuch finden Sie auf der [termscp-Website](https://termscp.veeso.dev/termscp/#user-manual) oder auf [Github](man.md). --- diff --git a/docs/es/README.md b/docs/es/README.md index 7fbfed1..079e9d9 100644 --- a/docs/es/README.md +++ b/docs/es/README.md @@ -6,11 +6,11 @@

~ Una transferencia de archivos de terminal rica en funciones ~

- Sitio Web + Sitio Web · - Instalación + Instalación · - Manual de usuario + Manual de usuario

@@ -62,7 +62,7 @@ />

-

Desarrollado por @veeso

+

Desarrollado por @veeso

Versión actual: 0.12.0 (19/04/2023)

@@ -175,7 +175,7 @@ mientras que si eres un usuario de Windows, puedes instalar termscp con [Chocola choco install termscp ``` -Para obtener más información u otras plataformas, visite [veeso.github.io](https://veeso.github.io/termscp/#get-started) para ver todos los métodos de instalación. +Para obtener más información u otras plataformas, visite [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started) para ver todos los métodos de instalación. ⚠️ Si estás buscando cómo actualizar termscp, simplemente ejecute termscp desde CLI con:: `(sudo) termscp --update` ⚠️ @@ -221,7 +221,7 @@ Puedes hacer una donación con una de estas plataformas: ## Manual de usuario y documentación 📚 -El manual del usuario se puede encontrar en el [sitio web de termscp](https://veeso.github.io/termscp/#user-manual) o en [Github](man.md). +El manual del usuario se puede encontrar en el [sitio web de termscp](https://termscp.veeso.dev/termscp/#user-manual) o en [Github](man.md). --- diff --git a/docs/fr/README.md b/docs/fr/README.md index 47aac9e..a321fb5 100644 --- a/docs/fr/README.md +++ b/docs/fr/README.md @@ -6,11 +6,11 @@

~ Un file transfer de terminal riche en fonctionnalités ~

- Site internet + Site internet · - Installation + Installation · - Manuel de l'Utilisateur + Manuel de l'Utilisateur

@@ -62,7 +62,7 @@ />

-

Développé par @veeso

+

Développé par @veeso

Version actuelle: 0.12.0 (19/04/2023)

@@ -175,7 +175,7 @@ tandis que si tu es un utilisateur Windows, tu peux installer termscp avec [Choc choco install termscp ``` -Pour plus d'informations sur les autres méthodes d'installation, veuillez visiter [veeso.github.io](https://veeso.github.io/termscp/#get-started). +Pour plus d'informations sur les autres méthodes d'installation, veuillez visiter [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started). ⚠️ Si tu cherche comme de mettre à jour termscp, tu dois exécuter cette commande dans le terminal: `(sudo) termscp --update` ⚠️ @@ -221,7 +221,7 @@ Tu peux faire un don avec l'une de ces plateformes: ## Manuel d'utilisateur et Documentation 📚 -Le manuel d'utilisateur peut être trouvé sur le [site de termscp](https://veeso.github.io/termscp/#user-manual) ou sur [Github](man.md). +Le manuel d'utilisateur peut être trouvé sur le [site de termscp](https://termscp.veeso.dev/termscp/#user-manual) ou sur [Github](man.md). La documentation peut être trouvé sur Rust Docs diff --git a/docs/it/README.md b/docs/it/README.md index 4d973e2..6787d98 100644 --- a/docs/it/README.md +++ b/docs/it/README.md @@ -6,11 +6,11 @@

~ Un file transfer ricco di funzionalità ~

- Sito + Sito · - Installazione + Installazione · - Manuale utente + Manuale utente

@@ -62,7 +62,7 @@ />

-

Sviluppato da @veeso

+

Sviluppato da @veeso

Versione corrente: 0.12.0 (19/04/2023)

@@ -175,7 +175,7 @@ mentre se sei un utente Windows, puoi installare termscp con [Chocolatey](https: choco install termscp ``` -Per ulteriori informazioni sui metodi di installazione su altre piattaforme, visita [veeso.github.io](https://veeso.github.io/termscp/#get-started). +Per ulteriori informazioni sui metodi di installazione su altre piattaforme, visita [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started). ⚠️ Se stavi cercando come aggiornare la tua versione di termscp, puoi semplicemente lanciare termscp con questi argomenti: `(sudo) termscp --update` ⚠️ @@ -221,7 +221,7 @@ Puoi fare una donazione tramite una di queste piattaforme: ## Manuale utente 📚 -Il manuale utente lo puoi trovare sul [sito di termscp](https://veeso.github.io/termscp/#user-manual) o su [Github](man.md). +Il manuale utente lo puoi trovare sul [sito di termscp](https://termscp.veeso.dev/termscp/#user-manual) o su [Github](man.md). --- diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index eb0628a..4f5028b 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -6,11 +6,11 @@

~ 功能丰富的终端文件传输工具 ~

- 网站 + 网站 · - 安装 + 安装 · - 用户手册 + 用户手册

@@ -62,7 +62,7 @@ />

-

由 @veeso 开发

+

由 @veeso 开发

当前版本： 0.12.0 (19/04/2023)

@@ -178,7 +178,7 @@ curl -sSLf http://get-termscp.veeso.dev | sh choco install termscp ``` -如需更多信息或其他的平台支持，请访问 [veeso.github.io](https://veeso.github.io/termscp/#get-started) 查看所有安装方法。 +如需更多信息或其他的平台支持，请访问 [termscp.veeso.dev](https://termscp.veeso.dev/termscp/#get-started) 查看所有安装方法。 ⚠️ 如果您正在寻找如何更新 termscp 只需从 CLI 运行 termscp ： `(sudo) termscp --update` ⚠️ @@ -225,7 +225,7 @@ choco install termscp ## 用户手册和文档 📚 -用户手册可以在[termscp的网站](https://veeso.github.io/termscp/#user-manual)或者在[Github](man.md)上找到。 +用户手册可以在[termscp的网站](https://termscp.veeso.dev/termscp/#user-manual)或者在[Github](man.md)上找到。 --- diff --git a/install.sh b/install.sh index 402f883..60c8329 100755 --- a/install.sh +++ b/install.sh @@ -209,6 +209,18 @@ install_on_arch_linux() { $pkg -S termscp } +install_with_brew() { + info "Installing termscp with brew" + if has termscp; then + info "Upgrading ${GREEN}termscp${NO_COLOR}…" + # The OR is used since someone could have installed via cargo previously + brew update && brew upgrade termscp || brew install veeso/termscp/termscp + else + info "Installing ${GREEN}termscp${NO_COLOR}…" + brew install veeso/termscp/termscp + fi +} + install_on_linux() { local msg local sudo @@ -271,6 +283,8 @@ install_on_linux() { info "$msg" $sudo rpm -U "${archive}" rm -f ${archive} + elif has brew; then + install_with_brew else try_with_cargo "No suitable installation method found for your Linux distribution; if you're running on Arch linux, please install an AUR package manager (such as yay). Currently only Arch, Debian based and Red Hat based distros are supported" "linux" fi @@ -278,23 +292,7 @@ install_on_linux() { install_on_macos() { if has brew; then - # get homebrew formula name - if [ "${ARCH}" == "x86_64" ]; then - FORMULA="termscp" - elif [ "$ARCH" == "aarch64" ]; then - FORMULA="termscp-m1" - else - error "unsupported arch: $ARCH" - exit 1 - fi - if has termscp; then - info "Upgrading ${GREEN}termscp${NO_COLOR}…" - # The OR is used since someone could have installed via cargo previously - brew update && brew upgrade ${FORMULA} || brew install veeso/termscp/${FORMULA} - else - info "Installing ${GREEN}termscp${NO_COLOR}…" - brew install veeso/termscp/${FORMULA} - fi + install_with_brew else try_with_cargo "brew is missing on your system; please install it from " "macos" fi @@ -478,8 +476,8 @@ case $PLATFORM in esac completed "Congratulations! Termscp has successfully been installed on your system!" -info "If you're a new user, you might be interested in reading the user manual " -info "While if you've just updated your termscp version, you can find the changelog at this link " +info "If you're a new user, you might be interested in reading the user manual " +info "While if you've just updated your termscp version, you can find the changelog at this link " info "Remember that if you encounter any issue, you can report them on Github " info "Feel free to open an issue also if you have an idea which could improve the project" info "If you want to support the project, please, consider a little donation " diff --git a/site/html/get-started.html b/site/html/get-started.html index 8440474..e722585 100644 --- a/site/html/get-started.html +++ b/site/html/get-started.html @@ -1,23 +1,19 @@ +

Get started

-  Quick setup +  Quick setup

- We strongly suggest this method to install termscp + We strongly suggest this method to install termscp

@@ -29,80 +25,52 @@

-  Windows users +  Windows users

- You can install termscp on Windows via - Chocolatey + You can install termscp on Windows via + Chocolatey 

choco install termscp

- Consider that Chocolatey moderation can take up to a few weeks + Consider that Chocolatey moderation can take up to a few weeks since last release, so if the latest version is not available yet, - you can install it downloading the ZIP file from - Github - and then, from the ZIP directory, install it via + you can install it downloading the ZIP file from + Github + and then, from the ZIP directory, install it via 

choco install termscp -s .

-  Linux users +  Linux users

- Opt for these methods instead if you don't feel confident using - the shell script + Opt for these methods instead if you don't feel confident using + the shell script

-  Arch derived users +  Arch derived users

- On Arch Linux based distros, you can install termscp using an AUR - package manager such as + On Arch Linux based distros, you can install termscp using an AUR + package manager such as yay then run: 

yay -S termscp

-  Debian derived users +  Debian derived + users

@@ -113,10 +81,8 @@ sudo dpkg -i termscp.deb

-  Redhat derived users +  Redhat derived + users

@@ -126,28 +92,32 @@ sudo dpkg -i termscp.debwget -O termscp.rpm https://github.com/veeso/termscp/releases/latest/download/termscp-0.12.0-1.x86_64.rpm sudo rpm -U termscp.rpm

+

+ Brew +

+
+

+ Install termscp via  + Brew +

+ 
brew install veeso/termscp/termscp
+

-  MacOS users +  MacOS users

- Opt for this method instead if you don't feel confident using the - shell script + Opt for this method instead if you don't feel confident using the + shell script

- Install termscp via  + Install termscp via  Brew 

brew install veeso/termscp/termscp
@@ -155,33 +125,22 @@ sudo rpm -U termscp.rpm

-  Install with Cargo +  Install with Cargo

- Opt for this method instead if binaries for your platform are not - available + Opt for this method instead if binaries for your platform are not + available

- If a package is not available for your system, you can opt to - install termscp via  - Cargo. - To install termscp via Cargo, these requirements must be - satisfied: + If a package is not available for your system, you can opt to + install termscp via  + Cargo. + To install termscp via Cargo, these requirements must be + satisfied:

  • @@ -212,4 +171,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 85360d4..d14d54a 100644 --- a/site/html/updates.html +++ b/site/html/updates.html @@ -24,7 +24,7 @@ Termscp is an application that is still in its early stage of development, the first version has been released in december in 2020 and practically there's only one - guy working on + guy working on it and there's still a lot of work to do in order to improve it and make it fast and reliable. Along to this, you should also consider that since it's an application which works with network protocols and