summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Patsura <[email protected]>2019-06-07 18:18:13 +0300
committerDmitry Patsura <[email protected]>2019-06-07 18:18:13 +0300
commitf00608935f3d2576bf3edc50d3eb303ce2cd66ea (patch)
treec6b0cb16e668694acb42d3316e83f24cfaa7d666
parentb71ec58e30da602a3d3f04feb00f9dc4f806245b (diff)
Fix(rr): Allow to run without ext-zip for linux
-rw-r--r--.travis.yml8
-rw-r--r--src/bin/rr2
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 27a523f4..24aacbf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,26 +42,26 @@ jobs:
before_install:
- sudo add-apt-repository -y ppa:ondrej/php
- sudo apt-get update
- - sudo apt-get install -y php7.0-cli php7.0-zip php7.0-curl
+ - sudo apt-get install -y php7.0-cli php7.0-curl
- sudo cp `which php7.0` `which php`
- stage: Test
env: "PHP=7.1"
before_install:
- sudo add-apt-repository -y ppa:ondrej/php
- sudo apt-get update
- - sudo apt-get install -y php7.1-cli php7.1-zip php7.1-curl
+ - sudo apt-get install -y php7.1-cli php7.1-curl
- sudo cp `which php7.1` `which php`
- stage: Test
env: "PHP=7.2"
before_install:
- sudo add-apt-repository -y ppa:ondrej/php
- sudo apt-get update
- - sudo apt-get install -y php7.2-cli php7.2-zip php7.2-curl
+ - sudo apt-get install -y php7.2-cli php7.2-curl
- sudo cp `which php7.2` `which php`
- stage: Test
env: "PHP=7.3"
before_install:
- sudo add-apt-repository -y ppa:ondrej/php
- sudo apt-get update
- - sudo apt-get install -y php7.3-cli php7.3-zip php7.3-curl
+ - sudo apt-get install -y php7.3-cli php7.3-curl
- sudo cp `which php7.3` `which php` \ No newline at end of file
diff --git a/src/bin/rr b/src/bin/rr
index 87403e38..a2a099db 100644
--- a/src/bin/rr
+++ b/src/bin/rr
@@ -33,7 +33,7 @@ if (!defined('RR_COMPOSER_INSTALL')) {
die(1);
}
-if (!class_exists('ZipArchive')) {
+if (RRHelper::getOSType() !== 'linux' && !class_exists('ZipArchive')) {
fwrite(STDERR, 'Extension `php-zip` is required.' . PHP_EOL);
die(1);
}