Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

fix node-gyp dependency check and prevent early exit during checking node-gyp installed (bash -e) #1355

Merged
merged 12 commits into from
Jan 5, 2024
Merged

fix node-gyp dependency check and prevent early exit during checking node-gyp installed (bash -e) #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5086883
Bump up Node Version and fix owt-deps-webrtc folder name for Docker B…
erenerdemli Feb 8, 2022
917bfcf
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli Mar 9, 2022
9e9166c
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli May 6, 2022
509c217
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli Mar 18, 2023
73b07cb
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli Oct 19, 2023
974f622
fix 404 zlib library not found error by Bumping it to version 1.3
erenerdemli Oct 19, 2023
1879e0c
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli Oct 20, 2023
262f35a
Add quic-lib, webrtc-XX and binding.gyp to ignore list
Oct 20, 2023
3e4dec0
prevent bash early exit -e for node-gyp check as installer exits if p…
Oct 20, 2023
34a0b9f
Check for required version of node-gyp as npm list -g might already h…
Oct 20, 2023
d310918
remove errorness .gitignore
erenerdemli Oct 22, 2023
4d2af7c
Merge branch 'open-webrtc-toolkit:master' into master
erenerdemli Nov 7, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
build/
dist/
third_party/quic-lib
third_party/node-v*
third_party/usrsctp/
third_party/licode/
third_party/openh264
third_party/nICEr
third_party/re
third_party/webrtc
third_party/webrtc-*
third_party/SVT-HEVC
node_modules/
*.o
Expand Down
9 changes: 5 additions & 4 deletions scripts/installCommonDeps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,18 +519,19 @@ install_node() {
}

install_node_tools() {
local installed=0
if [ "$CHECK_INSTALL" = true ]; then
npm list -g node-gyp > /dev/null 2>&1
if [ $? -eq 0 ]; then
npm list -g node-gyp@6.1.0 > /dev/null 2>&1 || installed=1
if [ $installed -eq 0 ]; then
echo "node_tools - Yes"
else
echo "node_tools - No"
fi
return 0
fi
if [ "${INCR_INSTALL}" == "true" ]; then
npm list -g node-gyp > /dev/null 2>&1
[ $? -eq 0 ] && echo "node tools already installed." && return 0
npm list -g node-gyp@6.1.0 > /dev/null 2>&1 || installed=1
[ $installed -eq 0 ] && echo "node tools already installed." && return 0
fi

check_proxy
Expand Down
Loading