Installed does not need to check if icon dirs are writable, create ar…

…chive script has more text excludes.
Cacodaimon · Feb 16, 2015 · f9b0e95 · f9b0e95
1 parent 1d8ae41
commit f9b0e95
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/create_archives.sh b/create_archives.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-EXCLUDE_FILES="--exclude=CacoCloud.tar --exclude=.git --exclude=CacoCloud.tar.* --exclude=Gruntfile.js --exclude=package.json --exclude=composer.lock --exclude=composer.phar --exclude=composer.json --exclude=nohup.out --exclude=spec --exclude=reports --exclude=assets  --exclude=node_modules --exclude=*.sh --exclude=public/install/finished --exclude=database/app.sqlite* --exclude=public/icons/bookmark/* --exclude=public/icons/feed/*  --exclude=vendor/simplepie/simplepie/demo --exclude=vendor/simplepie/simplepie/tests  --exclude=vendor/slim/slim/tests --exclude=vendor/phpmailer/phpmailer/examples"
+EXCLUDE_FILES="--exclude=CacoCloud.tar --exclude=.git --exclude=CacoCloud.tar.* --exclude=Gruntfile.js --exclude=package.json --exclude=composer.lock --exclude=composer.phar --exclude=composer.json --exclude=nohup.out --exclude=spec --exclude=reports --exclude=assets  --exclude=node_modules --exclude=*.sh --exclude=public/install/finished --exclude=database/app.sqlite* --exclude=public/icons/bookmark/* --exclude=public/icons/feed/*  --exclude=vendor/simplepie/simplepie/demo --exclude=vendor/simplepie/simplepie/tests  --exclude=vendor/slim/slim/tests --exclude=vendor/phpmailer/phpmailer/examples --exclude=vendor/guzzlehttp/guzzle/tests --exclude=vendor/react/promise/tests --exclude=vendor/guzzlehttp/ringphp/tests --exclude=vendor/guzzlehttp/streams/tests --exclude=vendor/arthurhoaro/favicon/resources/tests"
 FILE_NAME="CacoCloud"
 GZIP="czpvf $FILE_NAME.tar.gz"
-BZIP="cjpvf $FILE_NAME.tar.bz2"
 
-tar -$GZIP * $EXCLUDE_FILES
-tar -$BZIP * $EXCLUDE_FILES
+tar -$GZIP * $EXCLUDE_FILES
diff --git a/public/install/index.php b/public/install/index.php
@@ -33,7 +33,6 @@
             'mbstring'           => extension_loaded('mbstring'),
             'iconv'              => extension_loaded('iconv'),
             'installDirWritable' => is_writable(__DIR__),
-            'iconDirsWritable'   => is_writable(getcwd() . '/public/icons/bookmark') && is_writable(getcwd() . '/public/icons/feed'),
             'php_5_4'            => version_compare(PHP_VERSION, '5.4.0', '>='),
         ]);
     });

diff --git a/public/install/views/step-requirements.phtml b/public/install/views/step-requirements.phtml
@@ -95,15 +95,6 @@
     </p>
 </div>
 
-<div class="alert alert-<?php echo $iconDirsWritable ? 'success' : 'warning' ?>">
-    <strong>
-        <span class="fa <?php echo $iconDirsWritable ? 'fa-check-square-o' : 'fa-square-o' ?>"></span> public/icons/feed and public/icons/bookmark is writable!
-    </strong>
-    <p>
-        The directories <code>public/icons/feed</code> and <code>public/icons/bookmark</code> must be writable when using the bookmark manager or feed reader!
-    </p>
-</div>
-
 <div class="alert alert-<?php echo $https ? 'success' : 'warning' ?>">
     <strong>
         <span class="fa <?php echo $https ? 'fa-check-square-o' : 'fa-square-o' ?>"></span> HTTPS