Dostosowanie plików dla komputera.

diff --git a/base.sh b/base.sh
index 5a6473e8f1b53a55d296c20423bd6031fa979b27..886ea4a221bf966b50c02a9666687d221af387fd 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -106,12 +106,22 @@ cp -vv ~/immudex/tools/bin/immudex-autostart-x4notes /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-branch /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-import-gpgkeys /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-import-sshkeys /usr/local/bin;
-cp -vv ~/l-tc-n50s/immudex-import-kdeconnect /usr/local/bin;
+#cp -vv ~/l-tc-n50s/immudex-import-kdeconnect /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-meteo /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-morketsmerke /usr/local/bin;
 cp -vv ~/l-tc-n50s/immudex-motd2 /usr/local/bin/immudex-motd2;
 cp -vv ~/l-tc-n50s/immudex-run /usr/local/bin/immudex-run;
-cp -vv ~/l-tc-n50s/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
+
+#Na Debianie 13 Nextcloud przestał łapać konfigurację przy ustawionej zmiennej
+#HOME. Zaszła potrzeba zmiany lokalizacji konfiguracji do natywnego katalogu
+#domowego (/home/user), mimo to Nextcloud zapisuje wszystko na /ic0, tak jak
+#konfiguruje go skrypt.
+if [ "$DEBVER" = "oldstable" ]; then
+  cp -vv ~/l-tc-n50s/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
+elif [ "$DEBVER" = "stable" ]; then
+  cp -vv ~/l-tc-n50s/immudex-nextcloud-d13 /usr/local/bin/immudex-nextcloud;
+fi
+
 cp -vv ~/immudex/tools/bin/immudex-padlock /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
 wget https://ftp.morketsmerke.org/librewolf/immudex-secured-firefox -O /usr/local/bin/immudex-secured-firefox;
@@ -231,12 +241,13 @@ install_packages wireshark;
 bash ~/immudex/addons/chirp;
 bash ~/immudex/addons/iwlwifi;
 bash ~/immudex/addons/ncspot;
-bash ~/immudex/addons/lampstack;
+#bash ~/immudex/addons/lampstack;
+install_packages apache2 libapache2-mod-php php;
 #bash ~/immudex/addons/realtek;
 #cp -vv ~/l-tc-n50s/morketsmerke.nmconnection /etc/NetworkManager/system-connections/morketsmerke.nmconnection
 
 #chmod 600 /etc/NetworkManager/system-connections/*;
-usermod -aG www-data xf0r3m
+usermod -aG www-data $username
 chown -R www-data:www-data /var/www
 chmod -R 775 /var/www;
 cp -vv ~/l-tc-n50s/oh-my-posh-install.sh /tmp/oh-my-posh-install.sh;

diff --git a/template.sh b/template.sh
index 5e2cb7d5e6afaeb1780272e02785a74554865650..9d2e3bed04a2f6ecb397abea1ddefb0577f0baca 100644 (file)
--- a/template.sh
+++ b/template.sh
@@ -69,7 +69,7 @@ function make_changelog_file() {
   echo "COMMIT=\"${COMMIT}\"" >> $FILE;
   echo "ADDONS=\"${ADDONS}\"" >> $FILE;
   echo "-== Diffrences in version file ==-" >> $FILE;
-  cp ${HOME}/immudex/versions/base.sh ${HOME}/latitude-7420/base.sh; 
-  (cd ${HOME}/latitude-7420 && git diff base.sh) >> $FILE;
+  cp ${HOME}/immudex/versions/base.sh ${HOME}/l-tc-n50s/base.sh; 
+  (cd ${HOME}/l-tc-n50s && git diff base.sh) >> $FILE;
   return 0;
 }