Skip to content

Commit 49d7d4a

Browse files
authored
Remove NVM dependency and fix GOlang dependency crawling (#2979)
1 parent 4b638e9 commit 49d7d4a

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

install/cronicle-install.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,21 @@ network_check
1414
update_os
1515

1616
msg_info "Installing Dependencies"
17-
$STD apt-get install -y curl
18-
$STD apt-get install -y sudo
19-
$STD apt-get install -y mc
20-
$STD apt-get install -y git
21-
$STD apt-get install -y make
22-
$STD apt-get install -y g++
23-
$STD apt-get install -y gcc
17+
$STD apt-get install -y \
18+
curl \
19+
sudo \
20+
mc
2421
msg_ok "Installed Dependencies"
2522

23+
msg_info "Setting up Node.js Repository"
24+
mkdir -p /etc/apt/keyrings
25+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
26+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
27+
msg_ok "Set up Node.js Repository"
28+
2629
msg_info "Installing Node.js"
27-
$STD bash <(curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh)
28-
. ~/.bashrc
29-
$STD nvm install 16.20.1
30-
ln -sf /root/.nvm/versions/node/v16.20.1/bin/node /usr/bin/node
30+
$STD apt-get update
31+
$STD apt-get install -y nodejs
3132
msg_ok "Installed Node.js"
3233

3334
msg_info "Installing Cronicle Primary Server"

install/seelf-install.sh

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,29 @@ $STD apt-get install -y \
2020
mc \
2121
make \
2222
gcc
23-
wget -q https://go.dev/dl/go1.23.5.linux-amd64.tar.gz
24-
curl -s -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash &> /dev/null
25-
tar -C /usr/local -xzf go1.23.5.linux-amd64.tar.gz
26-
export PATH=$PATH:/usr/local/go/bin
27-
source ~/.bashrc
28-
$STD nvm install node
2923
msg_ok "Installed Dependencies"
3024

25+
msg_info "Installing Golang"
26+
set +o pipefail
27+
temp_file=$(mktemp)
28+
golang_tarball=$(curl -s https://go.dev/dl/ | grep -oP 'go[\d\.]+\.linux-amd64\.tar\.gz' | head -n 1)
29+
wget -q https://golang.org/dl/"$golang_tarball" -O "$temp_file"
30+
tar -C /usr/local -xzf "$temp_file"
31+
ln -sf /usr/local/go/bin/go /usr/local/bin/go
32+
set -o pipefail
33+
msg_ok "Installed Golang"
34+
35+
msg_info "Setting up Node.js Repository"
36+
mkdir -p /etc/apt/keyrings
37+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
38+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
39+
msg_ok "Set up Node.js Repository"
40+
41+
msg_info "Installing Node.js"
42+
$STD apt-get update
43+
$STD apt-get install -y nodejs
44+
msg_ok "Installed Node.js"
45+
3146
msg_info "Setting up seelf. Patience"
3247
RELEASE=$(curl -s https://api.github.com/repos/YuukanOO/seelf/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
3348
wget -q "https://github.com/YuukanOO/seelf/archive/refs/tags/v${RELEASE}.tar.gz"
@@ -71,7 +86,7 @@ customize
7186
# Cleanup
7287
msg_info "Cleaning up"
7388
rm -f ~/v${RELEASE}.tar.gz
74-
rm -f ~/go1.23.5.linux-amd64.tar.gz
89+
rm -f $temp_file
7590
$STD apt-get -y autoremove
7691
$STD apt-get -y autoclean
7792
msg_ok "Cleaned"

0 commit comments

Comments
 (0)