Skip to content

Commit

Permalink
v6.31
Browse files Browse the repository at this point in the history
+ DietPi-Software | Node.js: libatomic1 is required to start Node since last year: #3614
+ DietPi-Software | Node.js: Increase install verbosity and error handling
+ DietPi-Software | Certbot: Minor wording, uninstall enhancement and use follow official notation "Certbot" with lower case "b".
  • Loading branch information
MichaIng authored Jun 19, 2020
1 parent 13f88e7 commit 95b8e7e
Showing 1 changed file with 21 additions and 12 deletions.
33 changes: 21 additions & 12 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -1687,8 +1687,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it
#------------------
software_id=92

aSOFTWARE_NAME[$software_id]='CertBot'
aSOFTWARE_DESC[$software_id]='free, ssl cert install allowing https://'
aSOFTWARE_NAME[$software_id]='Certbot'
aSOFTWARE_DESC[$software_id]="Obtain and renew Let's Encrypt SSL certs for HTTPS"
aSOFTWARE_TYPE[$software_id]=0
aSOFTWARE_CATEGORY_INDEX[$software_id]=13
aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1062#p1062'
Expand Down Expand Up @@ -4664,7 +4664,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-

fi

software_id=92 # Let's Encrypt
software_id=92 # Certbot
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
Expand Down Expand Up @@ -6594,14 +6594,17 @@ sudo -u $ha_user dash -c '$ha_pyenv_activation; pip3 install -U homeassistant'"
INSTALL_URL_ADDRESS='https://raw.githubusercontent.com/taaem/nodejs-linux-installer/master/node-install.sh'
G_CHECK_URL "$INSTALL_URL_ADDRESS"

wget "$INSTALL_URL_ADDRESS"
G_EXEC wget "$INSTALL_URL_ADDRESS"
# ARMv6 workaround: https://github.com/MichaIng/DietPi/issues/2755
(( $G_HW_ARCH == 1 )) && sed -i 's|nodejs.org/dist/latest/|nodejs.org/dist/latest-v11.x/|g' node-install.sh

mkdir -p /usr/local # failsafe
chmod +x node-install.sh
./node-install.sh
rm node-install.sh
G_EXEC mkdir -p /usr/local # failsafe
G_EXEC chmod +x node-install.sh
G_EXEC_OUTPUT=1 G_EXEC ./node-install.sh
G_EXEC_NOHALT=1 G_EXEC rm node-install.sh

# Deps: https://github.com/MichaIng/DietPi/issues/3614
G_AGI libatomic1

fi

Expand Down Expand Up @@ -13662,13 +13665,19 @@ _EOF_

fi

software_id=92
software_id=92 # Certbot
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
G_AGP python3-certbot-apache python3-certbot-nginx certbot
[[ -f '/etc/systemd/system/certbot.service' ]] && rm /etc/systemd/system/certbot.service
[[ -d '/etc/systemd/system/certbot.service.d' ]] && rm -R /etc/systemd/system/certbot.service.d
# Pre-v6.3
if [[ -f '/etc/systemd/system/certbot.service' ]]; then

systemctl disable --now certbot
rm /etc/systemd/system/certbot.service

fi

fi

Expand Down Expand Up @@ -14674,14 +14683,14 @@ _EOF_

fi

software_id=9
software_id=9 # Node.js
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
npm r -g n yarn npm
G_AGP nodejs

# Old install via repo
G_AGP nodejs
[[ -f '/etc/apt/sources.list.d/nodesource_nodejs.list' ]] && rm /etc/apt/sources.list.d/nodesource_nodejs.list

[[ -f '/usr/local/bin/node' ]] && rm /usr/local/bin/node
Expand Down

0 comments on commit 95b8e7e

Please sign in to comment.