v1.9.7: update domains, deprecate updater.sh

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Test in Ubuntu/Mac/Alpine
 
 on:
   push:
@@ -25,8 +25,8 @@ jobs:
         run: $GITHUB_WORKSPACE/hosty.sh -di
       - name: Run hosty updater in debug mode
         run: $GITHUB_WORKSPACE/updater.sh -d
-      - name: Run hosty installer answering n/n
-        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
+      - name: Run hosty installer answering n
+        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo and with cat
         run: expect -c "spawn sh -c {cat $GITHUB_WORKSPACE/install.sh | sh}; expect \"y/n\r\"; send -- \"y\r\"; expect \"y/n\r\"; send -- \"y\r\"; expect \"or 'never':\r\"; send -- \"daily\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo
@@ -54,8 +54,8 @@ jobs:
         run: $GITHUB_WORKSPACE/hosty.sh -di
       - name: Run hosty updater in debug mode
         run: $GITHUB_WORKSPACE/updater.sh -d
-      - name: Run hosty installer answering n/n
-        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
+      - name: Run hosty installer answering n
+        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo and with cat
         run: expect -c "spawn sh -c {cat $GITHUB_WORKSPACE/install.sh | sh}; expect \"y/n\r\"; send -- \"y\r\"; expect \"y/n\r\"; send -- \"y\r\"; expect \"or 'never':\r\"; send -- \"daily\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo
@@ -86,8 +86,8 @@ jobs:
         run: $GITHUB_WORKSPACE/hosty.sh -di
       - name: Run hosty updater in debug mode
         run: $GITHUB_WORKSPACE/updater.sh -d
-      - name: Run hosty installer answering n/n
-        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
+      - name: Run hosty installer answering n
+        run: expect -c "spawn $GITHUB_WORKSPACE/install.sh; expect \"y/n\r\"; send -- \"n\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo and with cat
         run: expect -c "spawn sh -c {cat $GITHUB_WORKSPACE/install.sh | sh}; expect \"y/n\r\"; send -- \"y\r\"; expect \"y/n\r\"; send -- \"y\r\"; expect \"or 'never':\r\"; send -- \"daily\r\"; expect \"done.\r\"; expect eof"
       - name: Run hosty installer without sudo

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 astro
+Copyright (c) 2024 4st.li
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -21,34 +21,26 @@ In the predefined list we don't accept political censorship or paternalistic goa
 
 - curl
 - awk
-- gpg (optional for automatic hosty version update)
 - crontab (optional for automatic hosts file update)
 
 ### Install the requirements
 
 - **Ubuntu/Mint/Pop/Debian:**
-  `$ sudo apt install curl gawk gnupg cron`
+  `$ sudo apt install curl gawk cron`
 
 - **Arch/Manjaro/Endeavour:**
-  `$ sudo pacman -S --needed curl gawk gnupg cronie`
+  `$ sudo pacman -S --needed curl gawk cronie`
 
 - **Fedora/RHEL/Rocky:**
-  `$ sudo dnf in curl gawk gnupg2 cronie`
-
-- **Mac:**
-  `$ brew install gnupg`
+  `$ sudo dnf in curl gawk cronie`
 
 ### Install hosty
 
 Just run:
 
 `$ curl -L https://4st.li/hosty/install.sh | sh`
 
-The installer will ask you if you want to always run the latest version of hosty code, to achieve this, code updates are downloaded from this repository in each execution. A verification mechanism is included, hosty will make sure automatically that the updates are signed by me.
-
-Still, you may not like to trust me, you can also install hosty without automatic code updates and manually check if updates are available.
-
-You will also be asked if you want to automatically run hosty to update your hosts file with the latest domains list.
+You will be asked if you want to automatically run hosty to update your hosts file with the latest domains list.
 
 ## Run hosty
 

hosty.sh

@@ -2,11 +2,11 @@
 
 set -euf
 
-VERSION="1.9.6"
-RELEASE_DATE="08/sep/22"
-PROJECT_URL="astrolince.com/hosty"
-BLACKLIST_DEFAULT_SOURCE="https://raw.githubusercontent.com/astrolince/hosty/master/lists/blacklist.sources"
-WHITELIST_DEFAULT_SOURCE="https://raw.githubusercontent.com/astrolince/hosty/master/lists/whitelist.sources"
+VERSION="1.9.7"
+RELEASE_DATE="29/jan/24"
+PROJECT_URL="4st.li/hosty"
+BLACKLIST_DEFAULT_SOURCE="https://4st.li/hosty/lists/blacklist.sources"
+WHITELIST_DEFAULT_SOURCE="https://4st.li/hosty/lists/whitelist.sources"
 BLOCK_IP="0.0.0.0"
 INPUT_HOSTS="/etc/hosts"
 OUTPUT_HOSTS="/etc/hosts"
@@ -156,7 +156,7 @@ checkDep sort
 checkDep grep
 
 echo "======== hosty v$VERSION ($RELEASE_DATE) ========"
-echo "========   $PROJECT_URL   ========"
+echo "========       $PROJECT_URL       ========"
 echo
 
 # avoid all system changes if debug mode is enabled

hosty.sh.sig

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCAAdFiEERngJi/V4PT9dUG62zDnG13vfAFMFAmMaWSoACgkQzDnG13vf
-AFOvPg//WoZAh3VPaqyETEfdPYO1jTLu8R6QIgshJVE6WHVP2Ho8W9Sswd3k/8gC
-gg3kKFwqpvTqJjiWXMazyb+P4SxV2GOOReFFCwsqk9itZouSQ3OY2K3pNtWORVno
-V539aAQ/q+HrsSwL7co7irtO95igOFVEkgJTPwcEDSXeiX2WxWxN+ukeLpQU6UXv
-G89BbLP5RNA/gJBMcKKc7i8NdlE1NZlNcIeX0os4tOb380kpjfrWFFUAL4Ggk75W
-jesm47Bb+FRQHhPxfVw5/eDX0yFhr/erZrInxP37SkoYTwRu2pZOHFYPnEI3YGts
-LX4rUjTtB4nkWgien0DR5ZPPqgJ4Emgy2+0mMemWaaxPkdesHEmpYjtGjnkcY238
-51h9jKDVbA/9HQaVGPTjhfxzAZrzQQ9KIKxk6M41YKKQm+BLG+HiY0KY0F0hXD/u
-e7qMuaW8J9yDEk7yJGJvpAqelnSkGLZasQAq2Oaqp0LuVXGQSfgGpcDp24QgvLo0
-MG1DqrrfbftjN1DFLDIWgFXPq3isIeG+unOwiRGRK7xjHL/wJLEsBcjBl8ltK2Fe
-E6vl1qQ/rf+gjTWdBaVix3z0A7dfIAsEbsoaZ0jAZJWx+lSgFWIsneCzxSMx0zXD
-O5YPNyyq8GXEJSjcys/ooJCYR0zCmHPNXVXpoLuRsVtZmizuLdo=
-=MkNN
+iQIzBAABCAAdFiEERngJi/V4PT9dUG62zDnG13vfAFMFAmW4YhsACgkQzDnG13vf
+AFMmZA//Y02XWBeMaa50rWXDscIhkC+pZJ6TGp8DnCX2DsbIY16xvxot2lJ6u28O
+H5GC1fw9Cs4d/9+9g6ACbA+crNU5JSDZnZ+DflCsslnssgHdSHCimEuM5F8JMFnu
+jPL6XHUOFtU3VG/eDueVpiTGhBuOw81fgchoPdB/pEH7L/NIOugkCa/ztgM1OzL+
+4ESxj+am37R6zVnYAawYrbPv/Q/ChNRbMY+11IiPo8498WwmBHmvTvi9nYSZuW16
+EW5AJ6Xc9dPPAhGtENwzfIIrP78VhZMxQZLoqXRFHL0qfbSMexhBhpzu3ywcL1xy
+LNFsM9ntnJB9SNZ8yEmwPkaFryx6eoh8DrhsYCnwGtwL5IAT7R1FPVOGSLappDPN
+UlBy4dQqYeP3tcpwrvF3KR7TGc8NmM9eMuAHubHyrWUk8xq8yyiFyQs/Tyf9Hoaz
+K5l0/6ss/YWDO0NYoCK22iOac6JzrmjbKQueOkZ+ytgCjP+KqoBfUnOT7oVH78d0
+5HnxNhu4O8/at1v5vT1E3S+aGAF/2nUiMhWNj0B5XMuknECInqi+V9LkF4U4wSmx
+zN44hXCzp0oC1YND+MubHHf6xvyP4PExGon4mTN0S5FNPjy3GvqmlYZPWRP4FaYg
+m6rHbW9xp33FwBcM9w2iXaPdJkL6XLtQwk9T0TnQsi9aJCFlCN8=
+=rbA+
 -----END PGP SIGNATURE-----

install.sh

@@ -13,7 +13,7 @@ checkDep() {
 checkDep curl
 
 echo "======== welcome to hosty installer ========"
-echo "========    astrolince.com/hosty    ========"
+echo "========        4st.li/hosty        ========"
 echo
 echo "checking if user has root access..."
 
@@ -47,30 +47,13 @@ if [ -f /usr/local/bin/hosty ]; then
     echo
 fi
 
-echo "do you want to always run the latest version of hosty? (recommended) y/n"
-read -r answer </dev/tty
-echo
-
-if [ "$answer" = "y" ] || [ "$answer" = "Y" ] || [ "$answer" = "yes" ] || [ "$answer" = "YES" ]; then
-    echo "installing hosty..."
-    if [ "$REQUEST_SUDO" = 1 ]; then
-        sudo curl -L --retry 3 -o /usr/local/bin/hosty https://raw.githubusercontent.com/astrolince/hosty/master/updater.sh
-    else
-        curl -L --retry 3 -o /usr/local/bin/hosty https://raw.githubusercontent.com/astrolince/hosty/master/updater.sh
-    fi
-    echo
-elif [ "$answer" = "n" ] || [ "$answer" = "N" ] || [ "$answer" = "no" ] || [ "$answer" = "NO" ]; then
-    echo "installing hosty..."
-    if [ "$REQUEST_SUDO" = 1 ]; then
-        sudo curl -L --retry 3 -o /usr/local/bin/hosty https://raw.githubusercontent.com/astrolince/hosty/master/hosty.sh
-    else
-        curl -L --retry 3 -o /usr/local/bin/hosty https://raw.githubusercontent.com/astrolince/hosty/master/hosty.sh
-    fi
-    echo
+echo "installing hosty..."
+if [ "$REQUEST_SUDO" = 1 ]; then
+    sudo curl -L --retry 3 -o /usr/local/bin/hosty https://4st.li/hosty/hosty.sh
 else
-    echo "bad answer, exiting..."
-    exit 1
+    curl -L --retry 3 -o /usr/local/bin/hosty https://4st.li/hosty/hosty.sh
 fi
+echo
 
 echo "fixing permissions..."
 if [ "$REQUEST_SUDO" = 1 ]; then

updater.sh

@@ -30,8 +30,8 @@ downloadFile() {
 
 # download files
 downloadFile "$astrokeys" https://keybase.io/astrolince/pgp_keys.asc
-downloadFile "$hosty" https://raw.githubusercontent.com/astrolince/hosty/master/hosty.sh
-downloadFile "$signature" https://raw.githubusercontent.com/astrolince/hosty/master/hosty.sh.sig
+downloadFile "$hosty" https://4st.li/hosty/hosty.sh
+downloadFile "$signature" https://4st.li/hosty/hosty.sh.sig
 
 # verify signature
 gpg --dearmor "$astrokeys" >/dev/null 2>&1