Преглед на файлове

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram преди 7 години
родител
ревизия
2e07c45147
променени са 1 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 4
    3
      src/freedombone-utils-postgresql

+ 4
- 3
src/freedombone-utils-postgresql Целия файл

50
 }
50
 }
51
 
51
 
52
 function mesh_install_postgresql {
52
 function mesh_install_postgresql {
53
-    # shellcheck disable=SC2154
54
-    chroot "$rootdir" apt-get -yq install "$POSTGRESQL_PACKAGES"
53
+    # shellcheck disable=SC2154,SC2086
54
+    chroot "$rootdir" apt-get -yq install $POSTGRESQL_PACKAGES
55
 
55
 
56
     if [ ! -d "$rootdir/etc/postgresql" ]; then
56
     if [ ! -d "$rootdir/etc/postgresql" ]; then
57
         echo $"ERROR: postgresql does not appear to have installed."
57
         echo $"ERROR: postgresql does not appear to have installed."
85
     fi
85
     fi
86
     "${PROJECT_NAME}-pass" -u root -a postgresql -p "$POSTGRESQL_PASSWORD"
86
     "${PROJECT_NAME}-pass" -u root -a postgresql -p "$POSTGRESQL_PASSWORD"
87
 
87
 
88
-    apt-get -yq install "$POSTGRESQL_PACKAGES"
88
+    # shellcheck disable=SC2086
89
+    apt-get -yq install $POSTGRESQL_PACKAGES
89
     apt-get -yq remove --purge apache2-bin*
90
     apt-get -yq remove --purge apache2-bin*
90
     if [ -d /etc/apache2 ]; then
91
     if [ -d /etc/apache2 ]; then
91
         rm -rf /etc/apache2
92
         rm -rf /etc/apache2