Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DietPi-Software | Node.js: Install libatomic1 only where required #7153

Merged
merged 4 commits into from
Jul 11, 2024
Merged

DietPi-Software | Node.js: Install libatomic1 only where required #7153

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3e2dab
v9.7
MichaIng Jul 10, 2024
028148f
v9.7
MichaIng Jul 10, 2024
042edd1
v9.7
MichaIng Jul 11, 2024
e253b66
v9.7
MichaIng Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3009,8 +3009,8 @@ unix_socket_directories = '/run/postgresql'" > "$i/00dietpi.conf"

if To_Install 9 # Node.js
then
# Deps: https://github.com/MichaIng/DietPi/issues/3614
aDEPS=('libatomic1')
# ARMv6/7/RISC-V deps (verified 2024-07-11): https://github.com/MichaIng/DietPi/issues/3614
(( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS=('libatomic1')

# Download installer
Download_Install 'https://github.com/raw/MichaIng/nodejs-linux-installer/master/node-install.sh'
Expand Down Expand Up @@ -6522,7 +6522,7 @@ _EOF_
esac

# Download
local fallback_url="https://github.com/fatedier/frp/releases/download/v0.58.1/frp_0.58.1_linux_$arch.tar.gz"
local fallback_url="https://github.com/fatedier/frp/releases/download/v0.59.0/frp_0.59.0_linux_$arch.tar.gz"
Download_Install "$(curl -sSfL 'https://github.com/gitapi/repos/fatedier/frp/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/frp_[0-9.]*_linux_$arch\.tar\.gz\"/{print \$4}")"

G_EXEC cd frp_*
Expand Down Expand Up @@ -9364,7 +9364,7 @@ _EOF_
if (( ${PHP_VERSION::1} > 7 ))
then
aDEPS+=("php$PHP_VERSION-curl")
local fallback_url='https://github.com/koel/koel/releases/download/v6.12.1/koel-v6.12.1.tar.gz' aphp_deps=('curl' 'dom')
local fallback_url='https://github.com/koel/koel/releases/download/v7.0.2/koel-v7.0.2.tar.gz' aphp_deps=('curl' 'dom')
Download_Install "$(curl -sSfL 'https://github.com/gitapi/repos/koel/koel/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\/koel-[^"\/]*\.tar\.gz"$/{print $4}')"
else
aDEPS+=("php$PHP_VERSION-json")
Expand Down Expand Up @@ -11098,7 +11098,7 @@ _EOF_

# Download
local version=$(curl -sSfL 'https://github.com/gitapi/repos/ptitSeb/box64/releases/latest' | mawk -F\" '/^ *"tag_name": "[^"]*",$/{print $4}')
[[ $version ]] || { version='v0.2.8'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $version ]] || { version='v0.3.0'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
Download_Install "https://github.com/ptitSeb/box64/archive/$version.tar.gz"

# Build for targets: https://github.com/ptitSeb/box64/blob/main/CMakeLists.txt
Expand Down