Move imapsync into local plugin archives

dapostinstall.sh

@@ -73,6 +73,7 @@ install_local_plugin_archive() {
     local archive="$1"
     local plugin_name
     local plugin_dir
+    local install_script
 
     plugin_name="$(basename "$archive" .tar.gz)"
     plugin_dir="$DADIR/plugins/$plugin_name"
@@ -81,21 +82,36 @@ install_local_plugin_archive() {
     rm -rf "$plugin_dir"
     mkdir -p "$plugin_dir"
     tar -zxf "$archive" -C "$plugin_dir"
+    chown -R diradmin:diradmin "$plugin_dir"
 
     if [[ -f "$plugin_dir/install.sh" ]]; then
+        install_script="./install.sh"
         chmod 755 "$plugin_dir/install.sh"
-        (
-            cd "$plugin_dir"
-            ./install.sh
-        )
+    elif [[ -f "$plugin_dir/scripts/install.sh" ]]; then
+        install_script="./scripts/install.sh"
+        chmod 755 "$plugin_dir/scripts/install.sh"
     else
-        fail "Brak wykonywalnego install.sh w $plugin_dir"
+        fail "Brak install.sh w $plugin_dir"
+    fi
+
+    (
+        cd "$plugin_dir"
+        "$install_script"
+    )
+
+    if [[ "$plugin_name" == "imapsync" ]]; then
+        echo 'imapsync=ON' >> /usr/local/directadmin/data/users/admin/user.conf
+        cp "$DAPOSTINSTALL_DIR/lang_pl.php" "$plugin_dir/lang"
+        chown -R diradmin:diradmin "$plugin_dir"
     fi
 
     if [[ "$plugin_name" == "redis-manager" ]]; then
         require_file "$DADIR/plugins/redis-manager/scripts/redis_install.sh"
         chmod 755 "$DADIR/plugins/redis-manager/scripts/redis_install.sh"
-        "$DADIR/plugins/redis-manager/scripts/redis_install.sh" "$REDIS_VERSION"
+        (
+            cd "$plugin_dir"
+            ./scripts/redis_install.sh "$REDIS_VERSION"
+        )
     fi
 }
 
@@ -483,18 +499,12 @@ sed -i 's^/etc/ssh/sshd_config^/etc/ssh/sshd_config_placebo^g' $DADIR/conf/direc
 systemctl restart directadmin
 
 echo "Instalacja pluginów DirectAdmin"
+echo "Instalacja pakietu IMAPsync"
+dnf -y install imapsync
 cd $DAPOSTINSTALL_DIR
 install_local_plugins
 cd $DAPOSTINSTALL_DIR
 
-echo "Instalacja IMAPsync"
-dnf -y install imapsync
-mkdir $DADIR/plugins/imapsync
-tar -zxf imapsync.tar.gz -C $DADIR/plugins/imapsync
-$DADIR/plugins/imapsync/scripts/install.sh
-echo 'imapsync=ON' >> /usr/local/directadmin/data/users/admin/user.conf
-cp lang_pl.php $DADIR/plugins/imapsync/lang
-
 echo "instalacja promptów"
 sh prompt.sh
 echo "Blokada dostępu do pluginu CustomBuild i informacjach o licencji"