slackware testing

Tomas-M · Aug 2, 2022 · 692d8de · 692d8de
1 parent 530c0df
commit 692d8de
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 25 deletions.
diff --git a/Slax/slackware15/helpers/fw.php b/Slax/slackware15/helpers/fw.php
@@ -2,12 +2,13 @@
 
    // There are quadrilions of different firmwares, can't possibly include all in Slax
    // We're going to delete all firmware drivers which are not wifi related
-   // Run this script, it is safe (read only). Prints drivers which should be deleted
+   // Run this script, it is safe (read only). Prints drivers which are wifi-related
 
    $result=array();
    $fwdir="/lib/firmware";
+   chdir($fwdir);
 
-   echo "# Firmware files for deletion:\n";
+   echo "# Firmware files for inclusion:\n";
 
    $descr=file_get_contents("$fwdir/WHENCE");
    $drivers=preg_split("{---------------+}",$descr);
@@ -16,23 +17,22 @@
    {
       if (preg_match("{Driver:(.*)}i",$bunch,$matches))
       {
-         $size=0; $files=array();
+         $files=array();
          $driver=trim($matches[1]);
          preg_match_all("{(File|Source):(.*)}i",$bunch,$matches);
          foreach($matches[2] as $file)
          {
             $file=$fwdir."/".trim($file);
-            $files[]=$file;
-            $size+=filesize($file);
+            if (@filesize($file)>0) $files[]=$file;
          }
-         if (preg_match("{wifi|wireless|wi-fi|radeon|atheros}i",$bunch))
-            if (!preg_match("{audio|bluetooth|serial|adsl|wimax|USB}i",$bunch))
+         if (preg_match("{wifi|wireless|wi-fi|radeon|atheros|802}i",$bunch))
+            if (!preg_match("{amdgpu|audio|bluetooth|serial|adsl|wimax|USB}i",$bunch))
             {
-               $result[$driver]=floor($size/1024);
+               $result+=$files;
             }
-         else echo join("\n",$files)."\n";
-         else echo join("\n",$files)."\n";
       }
    }
 
+   foreach($result as $row) echo "mkdir -p \$1/".dirname($row)."\ncp $row \$1".$row."\n";
+
 ?>
diff --git a/Slax/slackware15/modules/03-desktop/rootcopy/usr/bin/fbliveapp b/Slax/slackware15/modules/03-desktop/rootcopy/usr/bin/fbliveapp
@@ -1,23 +1,11 @@
 #!/bin/bash
 
-if [ "$1" = "vlc" ]; then
-   NAME="VLC Video Player"
-   ABOUT="VLC Video Player is a free and open source multimedia player
-and framework that plays most multimedia files as well as DVDs,
-Audio CDs, CVDs, and various streaming protocols."
-   EXECUTABLE="/usr/bin/vlc"
-   INSTALL="wget -c -O /tmp/07-vlc.sb https://slax.org/download/vlc/07-vlc.sb && slax activate /tmp/07-vlc.sb"
-   POSTINSTALL="rm /usr/share/applications/vlc.desktop; mkdir /home/guest/.config/vlc; echo '[qt4]
-qt-privacy-ask=0' > /home/guest/.config/vlc/vlcrc;"
-   GUEST=true
-fi
-
 if [ "$1" = "google-chrome" ]; then
    NAME="Google Chrome Web Browser"
    ABOUT="Google Chrome is a web browser from Google,
 that makes the web faster, safer, and easier."
    EXECUTABLE="/opt/google/chrome/chrome"
-   INSTALL="wget -c -O /tmp/05-chrome.sb https://slax.org/download/google/chrome/05-chrome.sb && slax activate /tmp/05-chrome.sb"
+   INSTALL="wget -c -O /tmp/05-chrome.sb 'https://slax.org/download-google-chrome.php?b=slackware&v=$(cat /etc/slax-version | tr -s " " "_")' && slax activate /tmp/05-chrome.sb"
    POSTINSTALL=""
    GUEST=true
 fi

diff --git a/Slax/slackware15/modules/03-desktop/rootcopy/usr/share/applications/google-chrome.desktop b/Slax/slackware15/modules/03-desktop/rootcopy/usr/share/applications/google-chrome.desktop
@@ -6,7 +6,7 @@ Exec=fbliveapp google-chrome %U
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=/opt/google/chrome/product_logo_128.png
+Icon=chrome.png
 Categories=Network;WebBrowser;
 MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=chromium

diff --git a/...e15/modules/03-desktop/rootcopy/usr/share/icons/hicolor/128x128/apps/chrome.png b/...e15/modules/03-desktop/rootcopy/usr/share/icons/hicolor/128x128/apps/chrome.png
diff --git a/Slax/slackware15/modules/05-chrome/rootcopy/usr/share/applications/google-chrome.desktop b/Slax/slackware15/modules/05-chrome/rootcopy/usr/share/applications/google-chrome.desktop
@@ -6,7 +6,7 @@ Exec=fbliveapp google-chrome %U
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=/opt/google/chrome/product_logo_128.png
+Icon=chrome.png
 Categories=Network;WebBrowser;
 MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=chromium