Bladeren bron

Install composer

Bob Mottram 7 jaren geleden
bovenliggende
commit
dd04199b4a
4 gewijzigde bestanden met toevoegingen van 23 en 22 verwijderingen
  1. 4
    0
      src/freedombone-app-kanboard
  2. 1
    13
      src/freedombone-app-koel
  3. 2
    9
      src/freedombone-app-movim
  4. 16
    0
      src/freedombone-utils-web

+ 4
- 0
src/freedombone-app-kanboard Bestand weergeven

560
     logging_off_kanboard
560
     logging_off_kanboard
561
 
561
 
562
     initialise_database kanboard /var/www/${KANBOARD_DOMAIN_NAME}/htdocs/app/Schema/Sql/mysql.sql
562
     initialise_database kanboard /var/www/${KANBOARD_DOMAIN_NAME}/htdocs/app/Schema/Sql/mysql.sql
563
+    chown -R www-data:www-data /var/www/${KANBOARD_DOMAIN_NAME}/htdocs
564
+
565
+    cd /var/www/${KANBOARD_DOMAIN_NAME}/htdocs
566
+    install_composer
563
 
567
 
564
     systemctl restart mariadb
568
     systemctl restart mariadb
565
     systemctl restart php7.0-fpm
569
     systemctl restart php7.0-fpm

+ 1
- 13
src/freedombone-app-koel Bestand weergeven

715
     install_koel_main
715
     install_koel_main
716
 
716
 
717
     cd /var/www/$KOEL_DOMAIN_NAME/htdocs
717
     cd /var/www/$KOEL_DOMAIN_NAME/htdocs
718
+    install_composer
718
 
719
 
719
-    # curl -sS https://getcomposer.org/installer | php
720
-    if [ -f ~/freedombone/image_build/composer_install ]; then
721
-        cat ~/freedombone/image_build/composer_install | php
722
-    else
723
-        if [ -f /home/$MY_USERNAME/freedombone/image_build/composer_install ]; then
724
-            cat /home/$MY_USERNAME/freedombone/image_build/composer_install | php
725
-        fi
726
-    fi
727
     npm install -g yarn
720
     npm install -g yarn
728
-    php composer.phar install
729
-    if [ ! "$?" = "0" ]; then
730
-        echo $'Unable to run composer install'
731
-        exit 7252198
732
-    fi
733
     npm install
721
     npm install
734
 
722
 
735
     function_check get_mariadb_password
723
     function_check get_mariadb_password

+ 2
- 9
src/freedombone-app-movim Bestand weergeven

383
     # Fix typo
383
     # Fix typo
384
     sed -i 's|weksocket|websocket|g' app/widgets/AdminTest/admintest.js
384
     sed -i 's|weksocket|websocket|g' app/widgets/AdminTest/admintest.js
385
 
385
 
386
-    # curl -sS https://getcomposer.org/installer | php
387
-    if [ -f ~/freedombone/image_build/composer_install ]; then
388
-        cat ~/freedombone/image_build/composer_install | php
389
-    else
390
-        if [ -f /home/$MY_USERNAME/freedombone/image_build/composer_install ]; then
391
-            cat /home/$MY_USERNAME/freedombone/image_build/composer_install | php
392
-        fi
393
-    fi
394
-    php composer.phar install
386
+    cd /var/www/$MOVIM_DOMAIN_NAME/htdocs
387
+    install_composer
395
 
388
 
396
     cd /var/www/$MOVIM_DOMAIN_NAME/htdocs/config
389
     cd /var/www/$MOVIM_DOMAIN_NAME/htdocs/config
397
     cp db.example.inc.php db.inc.php
390
     cp db.example.inc.php db.inc.php

+ 16
- 0
src/freedombone-utils-web Bestand weergeven

917
     fi
917
     fi
918
 }
918
 }
919
 
919
 
920
+function install_composer {
921
+    # curl -sS https://getcomposer.org/installer | php
922
+    if [ -f ~/${PROJECT_NAME}/image_build/composer_install ]; then
923
+        cat ~/${PROJECT_NAME}/image_build/composer_install | php
924
+    else
925
+        if [ -f /home/$MY_USERNAME/${PROJECT_NAME}/image_build/composer_install ]; then
926
+            cat /home/$MY_USERNAME/${PROJECT_NAME}/image_build/composer_install | php
927
+        fi
928
+    fi
929
+    php composer.phar install
930
+    if [ ! "$?" = "0" ]; then
931
+        echo $'Unable to run composer install'
932
+        exit 7252198
933
+    fi
934
+}
935
+
920
 # NOTE: deliberately no exit 0
936
 # NOTE: deliberately no exit 0