From 7b71e173e6682334cfc56940ac0784d17c9ab39f Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Wed, 26 Feb 2025 14:16:01 +0100 Subject: [PATCH] =?utf8?q?Dostosowanie=20pliku=20bazowego,=20aby=20korzyst?= =?utf8?q?a=C5=82=20z=20repozytorium.=20Dostoswanie=20funkcji=20generuj?= =?utf8?q?=C4=85cej=20changelog,=20zmieniaj=C4=85c=20punkt=20odniesienia?= =?utf8?q?=20zmian=20w=20obrazie=20wzgl=C4=99dem=20tego=20repozytorium.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- base.sh | 99 ++++++++++++++--------------------------------------- template.sh | 4 ++- 2 files changed, 29 insertions(+), 74 deletions(-) diff --git a/base.sh b/base.sh index 6d7f2dd..04aa0a7 100644 --- a/base.sh +++ b/base.sh @@ -12,8 +12,13 @@ else fi cd; -if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex; -else apt install git -y && git clone https://github.com/xf0r3m/immudex; +if [ -x /usr/bin/git ]; then + git clone https://github.com/xf0r3m/immudex; + git clone https://git.morketsmerke.org/git/e5270; +else + apt install git -y; + git clone https://github.com/xf0r3m/immudex; + git clone https://git.morketsmerke.org/git/e5270; fi source ~/immudex/versions/template.sh; @@ -93,15 +98,11 @@ cp -vv ~/immudex/tools/bin/immudex-import-gpgkeys /usr/local/bin; cp -vv ~/immudex/tools/bin/immudex-import-sshkeys /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 ~/immudex/tools/bin/immudex-motd2 /usr/local/bin; -wget localhost/~xf0r3m/e5270/immudex-motd2 -O /usr/local/bin/immudex-motd2; -wget localhost/~xf0r3m/e5270/immudex-run -O /usr/local/bin/immudex-run; -#wget localhost/~xf0r3m/e5270/immudex-updates -O /usr/local/bin/immudex-updates; -wget localhost/~xf0r3m/e5270/immudex-nextcloud -O /usr/local/bin/immudex-nextcloud; +cp -vv ~/e5270/immudex-motd2 /usr/local/bin/immudex-motd2; +cp -vv ~/e5270/immudex-run /usr/local/bin/immudex-run; +cp -vv ~/e5270/immudex-nextcloud /usr/local/bin/immudex-nextcloud; cp -vv ~/immudex/tools/bin/immudex-padlock /usr/local/bin; cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin; -#cp -vv ~/immudex/tools/bin/immudex-protected /usr/local/bin; -#cp -vv ~/immudex/tools/bin/immudex-protected-firefox /usr/local/bin; wget https://ftp.morketsmerke.org/librewolf/immudex-secured-firefox -O /usr/local/bin/immudex-secured-firefox; cp -vv ~/immudex/tools/bin/immudex-shoutcasts /usr/local/bin; cp -vv ~/immudex/tools/bin/immudex-version /usr/local/bin; @@ -111,7 +112,6 @@ install_packages fzf jq ueberzug; git clone https://github.com/pystardust/ytfzf /tmp/ytfzf; (cd /tmp/ytfzf && make install doc) -#cp -vv ~/immudex/tools/bin/immudex-ytplay /usr/local/bin; cp -vv ~/immudex/tools/bin/library.sh /usr/local/bin; cp -vv ~/immudex/tools/bin/idle-clic /usr/local/bin; cp -vv ~/immudex/tools/bin/sync.sh /usr/local/bin; @@ -122,31 +122,23 @@ cp -vv ~/immudex/tools/sbin/immudex-crypt /usr/local/sbin; cp -vv ~/immudex/tools/sbin/immudex-hostname /usr/local/sbin; cp -vv ~/immudex/tools/sbin/immudex-install /usr/local/sbin; cp -vv ~/immudex/tools/sbin/immudex-upgrade /usr/local/sbin; -#wget localhost/~xf0r3m/e5270/immudex-packages-update -O /usr/local/sbin/immudex-packages-update; chown root:root /usr/local/sbin/*; chmod 544 /usr/local/sbin/*; mkdir /etc/skel/.irssi -#cp -vv ~/immudex/files/config /etc/skel/.irssi; -#cp -vv ~/immudex/files/default.theme /etc/skel/.irssi; -#wget localhost/~xf0r3m/e5270/irssi-dark.png -O /usr/share/pixmaps/irssi-dark.png; -#wget localhost/~xf0r3m/e5270/irssi.desktop -O /usr/share/applications/irssi.desktop; cp -rvv ~/immudex/files/libreoffice /etc/skel/.config; cp -vv ~/immudex/files/firejail.config /etc/firejail; cp -vv ~/immudex/files/redshift.conf /etc/skel/.config; cp -vv ~/immudex/files/redshift.desktop /etc/skel/.config/autostart; -wget localhost/~xf0r3m/e5270/nextcloud.desktop -O /etc/skel/.config/autostart/nextcloud.desktop +cp -vv ~/e5270/nextcloud.desktop /etc/skel/.config/autostart/nextcloud.desktop cp -rvv ~/immudex/files/sync.sh /usr/share; -#cp -vv ~/immudex/files/gtk-main.css /usr/share/xfce4/notes/gtk-3.0/gtk.css; -#wget https://ftp.morketsmerke.org/librewolf/librewolf.desktop -O /usr/share/applications/librewolf.desktop; -wget localhost/~xf0r3m/e5270/org.keepassxc.KeePassXC.2.desktop -O /usr/share/applications/org.keepassxc.KeePassXC.2.desktop +cp -vv ~/e5270/org.keepassxc.KeePassXC.2.desktop /usr/share/applications/org.keepassxc.KeePassXC.2.desktop if [ -f /usr/share/applications/qmmp.desktop ]; then ln -s /usr/share/applications/qmmp.desktop /usr/share/applications/qmmp-1.desktop; fi -cp -vv ~/immudex/files/immudex_hostname.service /etc/systemd/system; -#wget localhost/~xf0r3m/e5270/immudex_updates.service -O /etc/systemd/system/immudex_updates.service; +#cp -vv ~/immudex/files/immudex_hostname.service /etc/systemd/system; tar -xf ~/immudex/files/mozilla.tgz -C /etc/skel; @@ -155,18 +147,8 @@ tar -xf /tmp/librewolf.tgz -C /etc/skel; wget https://ftp.morketsmerke.org/librewolf/16844254192.desktop -O /etc/skel/.config/xfce4/panel/launcher-5/16844254192.desktop; -#mv /usr/bin/firefox /usr/bin/firefox.old; -#chmod -x /usr/bin/firefox.old; -#rm /usr/bin/firefox-esr; -#ln -s /usr/local/bin/immudex-protected-firefox /usr/bin/firefox-esr; -#sed -i "s,Exec=/usr/lib/firefox-esr/firefox-esr %u,Exec=/usr/local/bin/immudex-protected /usr/lib/firefox-esr/firefox-esr," /usr/share/applications/firefox-esr.desktop; - -#sed -i 's/firefox-esr/librewolf/g' /etc/skel/.config/mimeapps.list; -#sed -i 's/firefox-esr/librewolf/g' /usr/share/applications/mimeinfo.cache; - #Wyłączenie dla mnie immudex_hostname, ze względu na VPN #systemctl enable immudex_hostname.service; -#systemctl enable immudex_updates.service; cat >> /etc/bash.bashrc << EOL @@ -178,7 +160,7 @@ EOL echo "alias immudex-chhome='export HOME=\$(pwd)'" >> /etc/bash.bashrc; echo "alias immudex-changelogs='immudex-upgrade --check --print'" >> /etc/bash.bashrc; -echo "alias immudex-version='immudex-upgrade --myversion'" >> /etc/bash.bashrc; +echo "alias immudex-version='less /run/live/medium/live/changelog'" >> /etc/bash.bashrc; echo "alias immudex-pt='firejail --net=none packettracer'" >> /etc/bash.bashrc; chmod u+s /usr/bin/ping; @@ -194,18 +176,18 @@ echo "127.0.1.1 e5270" >> /etc/hosts; # Zmiany można umieścić również tutaj jeśli dotyczą one użytkowników lub ich # plików konfiguracyjnych -wget localhost/~xf0r3m/e5270/immudex-run-thunderbird -O /usr/local/bin/immudex-run-thunderbird; +cp -vv ~/e5270/immudex-run-thunderbird /usr/local/bin/immudex-run-thunderbird; chmod +x /usr/local/bin/*; -wget localhost/~xf0r3m/e5270/displays.xml -O /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml; -wget localhost/~xf0r3m/e5270/pointers.xml -O /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml +cp -vv ~/e5270/displays.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml; +cp -vv ~/e5270/pointers.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml mkdir /etc/skel/.config/xfce4/panel/launcher-16; mkdir /etc/skel/.config/xfce4/panel/launcher-17; -wget localhost/~xf0r3m/e5270/16967093831.desktop -O /etc/skel/.config/xfce4/panel/launcher-16/16967093831.desktop; -wget localhost/~xf0r3m/e5270/launcher-17/17399705731.desktop -O /etc/skel/.config/xfce4/panel/launcher-17/17399705731.desktop; -wget localhost/~xf0r3m/e5270/xfce4-panel.xml -O /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml; -wget localhost/~xf0r3m/e5270/whiskermenu-1.rc -O /etc/skel/.config/xfce4/panel/whiskermenu-1.rc -wget localhost/~xf0r3m/e5270/bashrc -O /etc/skel/.bashrc; +cp -vv ~/e5270/16967093831.desktop /etc/skel/.config/xfce4/panel/launcher-16/16967093831.desktop; +cp -vv ~/e5270/launcher-17/17399705731.desktop /etc/skel/.config/xfce4/panel/launcher-17/17399705731.desktop; +cp -vv ~/e5270/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml; +cp -vv ~/e5270/whiskermenu-1.rc /etc/skel/.config/xfce4/panel/whiskermenu-1.rc +cp -vv ~/e5270/bashrc /etc/skel/.bashrc; echo -n "Username: "; read username; @@ -225,35 +207,13 @@ usermod -L root; # Miejsce na twoje zmiany, przed poleceniem 'tidy' #bash ~/immudex/addons/nvidiaLatest; bash ~/immudex/addons/kvm; -wget localhost/~xf0r3m/e5270/nextcloud; -bash ~/nextcloud; -rm ~/nextcloud; +bash ~/e5270/nextcloud; install_packages wireshark; -#cd; -#mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.old -#wget https://archive.chirpmyradio.com/chirp_next/next-20240319/chirp-20240319-py3-none-any.whl -#trashFile=$(basename "https://archive.chirpmyradio.com/download?stream=next"); -#chirpRepoURL=$(wget -v "https://archive.chirpmyradio.com/download?stream=next" 2>&1 | grep 'Lokalizacja:' | head -1 | awk '{printf $2}'); -#rm $trashFile; -#chirpVer=$(basename $chirpRepoURL | cut -d "-" -f 2); -#chirpFilename="chirp-${chirpVer}-py3-none-any.whl"; -#wget ${chirpRepoURL}/${chirpFilename}; -#pip3 install $chirpFilename; -#rm $chirpFilename; -#install_packages python-wxtools -#cd - -#sed -i -e 's/chirpw/sudo chirpw/' -e 's/false/true/' /usr/share/applications/chirp.desktop; bash ~/immudex/addons/chirp; bash ~/immudex/addons/iwlwifi; bash ~/immudex/addons/ncspot; bash ~/immudex/addons/lampstack; bash ~/immudex/addons/realtek; -#wget localhost/~xf0r3m/e5270/WLAN1-84AJFG.nmconnection -O /etc/NetworkManager/system-connections/WLAN1-84AJFG.nmconnection -#wget localhost/~xf0r3m/e5270/HUAWEI_B818_4461_5G.nmconnection -O /etc/NetworkManager/system-connections/HUAWEI_B818_4461_5G.nmconnection -#wget localhost/~xf0r3m/e5270/HUAWEI_B818_4461.nmconnection -O /etc/NetworkManager/system-connections/HUAWEI_B818_4461.nmconnection -#wget localhost/~xf0r3m/e5270/MikroTik-715BEF.nmconnection -O /etc/NetworkManager/system-connections/MikroTik-715BEF.nmconnection -#wget localhost/~xf0r3m/e5270/TP-Link_E0A0_5G.nmconnection -O /etc/NetworkManager/system-connections/TP-Link_E0A0_5G.nmconnection -#wget localhost/~xf0r3m/e5270/TP-Link_E0A0.nmconnection -O /etc/NetworkManager/system-connections/TP-Link_E0A0.nmconnection wget localhost/~xf0r3m/e5270/AP301A-2.4GHz.nmconnection -O /etc/NetworkManager/system-connections/AP301A-2.4GHz.nmconnection wget localhost/~xf0r3m/e5270/AP301A-5GHz.nmconnection -O /etc/NetworkManager/system-connections/AP301A-5GHz.nmconnection @@ -261,16 +221,11 @@ chmod 600 /etc/NetworkManager/system-connections/*; usermod -aG www-data xf0r3m chown -R www-data:www-data /var/www chmod -R 775 /var/www; -#mkdir /home/xf0r3m/.ssh; -#wget localhost/~xf0r3m/e5270/known_hosts -O /home/xf0r3m/.ssh/known_hosts; -#chown -R xf0r3m:xf0r3m /home/xf0r3m/.ssh; -#chmod 600 /home/xf0r3m/.ssh/known_hosts; -#chmod 700 /home/xf0r3m/.ssh; -wget localhost/~xf0r3m/e5270/oh-my-posh-install.sh -O /tmp/oh-my-posh-install.sh; +cp -vv ~/e5270/oh-my-posh-install.sh /tmp/oh-my-posh-install.sh; bash /tmp/oh-my-posh-install.sh mv /root/.cache/oh-my-posh /usr/share; rm /tmp/oh-my-posh-install.sh; -wget localhost/~xf0r3m/e5270/immudex-nu.omp.json.nu-deploy -O /usr/share/oh-my-posh/immudex-nu.omp.json; +cp -vv ~/e5270/immudex-nu.omp.json.nu-deploy /usr/share/oh-my-posh/immudex-nu.omp.json; cd MLDepsUrl="https://gitweb.morketsmerke.org/?p=ML.git;a=blob_plain;f=dependecies.txt;hb=5e30c5b6d7f490bfdfffaa2cff615dc794534f8a"; install_packages $(curl "$MLDepsUrl" 2> /dev/null | awk '{printf $1" "}') @@ -284,7 +239,5 @@ cd bashtop; sudo make install; cd .. -#git clone https://git.morketsmerke.org/git/backup; -#bash ~/backup/cisco_pt.sh -#rm -rf ~/backup; +rm -rf ~/e5270 tidy; diff --git a/template.sh b/template.sh index 8fbe442..7161bdc 100644 --- a/template.sh +++ b/template.sh @@ -69,5 +69,7 @@ function make_changelog_file() { echo "COMMIT=\"${COMMIT}\"" >> $FILE; echo "ADDONS=\"${ADDONS}\"" >> $FILE; echo "-== Diffrences in version file ==-" >> $FILE; - (cd ${HOME}/e5270; git diff versions/base.sh) >> $FILE; + cp ${HOME}/immudex/versions/base.sh ${HOME}/e5270/base.sh; + (cd ${HOME}/e5270 && git diff base.sh) >> $FILE; + return 0; } -- 2.39.5