Skip to content

Commit 6c45fc6

Browse files
committed
Merge branch 'master' into 'master'
add check if wget is installed See merge request clients/cesium-grp/cesium!629
2 parents 1635074 + 609271f commit 6c45fc6

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

doc/fr/.presentation-2016-06-03.odp

179 Bytes
Binary file not shown.

doc/fr/presentation-2016-06-03.odp

-4.31 MB
Binary file not shown.

install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ install_from_github() {
6767

6868
do_install() {
6969

70-
if ! is_installed "curl"; then
71-
echo "=> curl is not available. You will likely need to install 'curl' package."
70+
if [! is_installed "curl"] | [! is_installed "wget"]; then
71+
echo "=> curl is not available. You will likely need to install 'curl' or 'wget' package."
7272
exit 1
7373
fi
7474
if ! is_installed "unzip"; then

0 commit comments

Comments
 (0)