diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index b393b47..fb037d7 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -269,6 +269,21 @@ multiImages: - src/opensuse/xfce/.config/xfce4/xfconf/** - src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - src/ubuntu/sysbox/** + - name1: opensuse + name2: 16 + base: opensuse/leap:16.0 + bg: bg_opensuse.png + distro: opensuse + dockerfile: dockerfile-kasm-core-suse + changeFiles: + - dockerfile-kasm-core-suse + - src/opensuse/** + - src/opensuse/xfce/** + - src/opensuse/xfce/.config/** + - src/opensuse/xfce/.config/xfce4/** + - src/opensuse/xfce/.config/xfce4/xfconf/** + - src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** + - src/ubuntu/sysbox/** - name1: fedora name2: 42 base: fedora:42 @@ -298,46 +313,18 @@ multiImages: - src/fedora43/xfce/.config/xfce4/xfconf/** - src/fedora43/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - name1: parrotos - name2: 6 - base: parrotsec/core:6 + name2: 7 + base: parrotsec/core:7.1 bg: bg_parrotos6.jpg - distro: parrotos6 + distro: parrotos7 dockerfile: dockerfile-kasm-core changeFiles: - dockerfile-kasm-core - - src/parrotos6/** + - src/parrotos7/** - src/ubuntu/nvidia/** - src/ubuntu/sysbox/** - src/ubuntu/virtualgl/** - - src/parrotos6/** - - name1: alpine - name2: 319 - base: alpine:3.19 - bg: bg_alpine.png - distro: alpine - dockerfile: dockerfile-kasm-core-alpine - changeFiles: - - dockerfile-kasm-core-alpine - - src/alpine/** - - src/alpine/xfce/** - - src/alpine/xfce/.config/** - - src/alpine/xfce/.config/xfce4/** - - src/alpine/xfce/.config/xfce4/xfconf/** - - src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** - - name1: alpine - name2: 320 - base: alpine:3.20 - bg: bg_alpine.png - distro: alpine - dockerfile: dockerfile-kasm-core-alpine - changeFiles: - - dockerfile-kasm-core-alpine - - src/alpine/** - - src/alpine/xfce/** - - src/alpine/xfce/.config/** - - src/alpine/xfce/.config/xfce4/** - - src/alpine/xfce/.config/xfce4/xfconf/** - - src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/** + - src/parrotos7/** - name1: alpine name2: 321 base: alpine:3.21 diff --git a/dockerfile-kasm-core b/dockerfile-kasm-core index 74e5dd0..eb77395 100644 --- a/dockerfile-kasm-core +++ b/dockerfile-kasm-core @@ -1,5 +1,5 @@ #### Build Stage #### -ARG BASE_IMAGE="ubuntu:20.04" +ARG BASE_IMAGE="ubuntu:24.04" FROM $BASE_IMAGE AS base_layer ### Environment config diff --git a/docs/core-alpine-317/README.md b/docs/core-alpine-317/README.md deleted file mode 100644 index b88a25b..0000000 --- a/docs/core-alpine-317/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Alpine 3.17. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/alpine-317-core.png "Image Screenshot" diff --git a/docs/core-alpine-317/demo.txt b/docs/core-alpine-317/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-alpine-317/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-alpine-317/description.txt b/docs/core-alpine-317/description.txt deleted file mode 100644 index a0b5a2e..0000000 --- a/docs/core-alpine-317/description.txt +++ /dev/null @@ -1 +0,0 @@ -Alpine 3.17 base image for Kasm Workspaces diff --git a/docs/core-alpine-318/README.md b/docs/core-alpine-318/README.md deleted file mode 100644 index 7cb47a0..0000000 --- a/docs/core-alpine-318/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Alpine 3.18. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/alpine-317-core.png "Image Screenshot" diff --git a/docs/core-alpine-318/description.txt b/docs/core-alpine-318/description.txt deleted file mode 100644 index 7185724..0000000 --- a/docs/core-alpine-318/description.txt +++ /dev/null @@ -1 +0,0 @@ -Alpine 3.18 base image for Kasm Workspaces diff --git a/docs/core-alpine-319/README.md b/docs/core-alpine-319/README.md deleted file mode 100644 index 05609a3..0000000 --- a/docs/core-alpine-319/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Alpine 3.19. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/alpine-317-core.png "Image Screenshot" diff --git a/docs/core-alpine-319/demo.txt b/docs/core-alpine-319/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-alpine-319/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-alpine-319/description.txt b/docs/core-alpine-319/description.txt deleted file mode 100644 index c15ac3e..0000000 --- a/docs/core-alpine-319/description.txt +++ /dev/null @@ -1 +0,0 @@ -Alpine 3.19 base image for Kasm Workspaces diff --git a/docs/core-centos-7/README.md b/docs/core-centos-7/README.md deleted file mode 100644 index 8176b6b..0000000 --- a/docs/core-centos-7/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible CentOS 7 with XFCE desktop environment. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/core-centos-7.png "Image Screenshot" \ No newline at end of file diff --git a/docs/core-centos-7/demo.txt b/docs/core-centos-7/demo.txt deleted file mode 100644 index 0ab2276..0000000 --- a/docs/core-centos-7/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Centos Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-centos-7/description.txt b/docs/core-centos-7/description.txt deleted file mode 100644 index f341af3..0000000 --- a/docs/core-centos-7/description.txt +++ /dev/null @@ -1 +0,0 @@ -CentOS 7 base image for Kasm Workspaces \ No newline at end of file diff --git a/docs/core-fedora-37/README.md b/docs/core-fedora-37/README.md deleted file mode 100644 index 833a608..0000000 --- a/docs/core-fedora-37/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Fedora 37. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/fedora-37-core.png "Image Screenshot" diff --git a/docs/core-fedora-37/demo.txt b/docs/core-fedora-37/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-fedora-37/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-fedora-37/description.txt b/docs/core-fedora-37/description.txt deleted file mode 100644 index 2a66ebd..0000000 --- a/docs/core-fedora-37/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 37 base image for Kasm Workspaces diff --git a/docs/core-fedora-38/README.md b/docs/core-fedora-38/README.md deleted file mode 100644 index 3009d68..0000000 --- a/docs/core-fedora-38/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Fedora 38. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/fedora-37-core.png "Image Screenshot" diff --git a/docs/core-fedora-38/demo.txt b/docs/core-fedora-38/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-fedora-38/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-fedora-38/description.txt b/docs/core-fedora-38/description.txt deleted file mode 100644 index eb5c0fa..0000000 --- a/docs/core-fedora-38/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 38 base image for Kasm Workspaces diff --git a/docs/core-fedora-39/README.md b/docs/core-fedora-39/README.md deleted file mode 100644 index 3310920..0000000 --- a/docs/core-fedora-39/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This image contains a browser-accessible version of Fedora 39. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/fedora-37-core.png "Image Screenshot" diff --git a/docs/core-fedora-39/demo.txt b/docs/core-fedora-39/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-fedora-39/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-fedora-39/description.txt b/docs/core-fedora-39/description.txt deleted file mode 100644 index 8e591e4..0000000 --- a/docs/core-fedora-39/description.txt +++ /dev/null @@ -1 +0,0 @@ -Fedora 39 base image for Kasm Workspaces diff --git a/docs/core-opensuse-16/README.md b/docs/core-opensuse-16/README.md new file mode 100644 index 0000000..39c43cf --- /dev/null +++ b/docs/core-opensuse-16/README.md @@ -0,0 +1,7 @@ +# About This Image + +This Image contains a browser-accessible openSUSE Leap 16 with XFCE desktop environment. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/core-opensuse-15.png "Image Screenshot" diff --git a/docs/core-opensuse-16/demo.txt b/docs/core-opensuse-16/demo.txt new file mode 100644 index 0000000..34c60e4 --- /dev/null +++ b/docs/core-opensuse-16/demo.txt @@ -0,0 +1,9 @@ +# Live Demo + +**Launch a real-time demo in a new browser window:** Live Demo. + + + +∗*This demo links to a openSUSE Desktop image to show the basic functionality of Kasm Workspaces.* + +∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-opensuse-16/description.txt b/docs/core-opensuse-16/description.txt new file mode 100644 index 0000000..1e1d2b0 --- /dev/null +++ b/docs/core-opensuse-16/description.txt @@ -0,0 +1 @@ +openSUSE Leap 16 base image for Kasm Workspaces diff --git a/docs/core-oracle-7/README.md b/docs/core-oracle-7/README.md deleted file mode 100644 index bcf704e..0000000 --- a/docs/core-oracle-7/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# About This Image - -This Image contains a browser-accessible Oracle Linux 7 with XFCE desktop environment. - -![Screenshot][Image_Screenshot] - -[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/core-oracle-7.png "Image Screenshot" diff --git a/docs/core-oracle-7/demo.txt b/docs/core-oracle-7/demo.txt deleted file mode 100644 index ce11e29..0000000 --- a/docs/core-oracle-7/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo is linked to Oracle Linux 8* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-oracle-7/description.txt b/docs/core-oracle-7/description.txt deleted file mode 100644 index 7868a9a..0000000 --- a/docs/core-oracle-7/description.txt +++ /dev/null @@ -1 +0,0 @@ -Oracle Linux 7 base image for Kasm Workspaces diff --git a/docs/core-parrotos-6/demo.txt b/docs/core-parrotos-6/demo.txt deleted file mode 100644 index bbd1f8e..0000000 --- a/docs/core-parrotos-6/demo.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Live Demo - -**Launch a real-time demo in a new browser window:** Live Demo. - - - -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* - -∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-parrotos-6/description.txt b/docs/core-parrotos-6/description.txt deleted file mode 100644 index c1634d3..0000000 --- a/docs/core-parrotos-6/description.txt +++ /dev/null @@ -1 +0,0 @@ -Parrot OS 6 base image for Kasm Workspaces diff --git a/docs/core-parrotos-6/README.md b/docs/core-parrotos-7/README.md similarity index 76% rename from docs/core-parrotos-6/README.md rename to docs/core-parrotos-7/README.md index c98ac94..fe04103 100644 --- a/docs/core-parrotos-6/README.md +++ b/docs/core-parrotos-7/README.md @@ -1,6 +1,6 @@ # About This Image -This image contains a browser-accessible version of Parrot OS 6. +This image contains a browser-accessible version of Parrot OS 7. ![Screenshot][Image_Screenshot] diff --git a/docs/core-alpine-318/demo.txt b/docs/core-parrotos-7/demo.txt similarity index 81% rename from docs/core-alpine-318/demo.txt rename to docs/core-parrotos-7/demo.txt index bbd1f8e..b4e76b3 100644 --- a/docs/core-alpine-318/demo.txt +++ b/docs/core-parrotos-7/demo.txt @@ -4,6 +4,6 @@ -∗*This demo links to a Jammy Desktop image to show the basic functionality of Kasm Workspaces.* +∗*This demo links to a ParrotOS Desktop image to show the basic functionality of Kasm Workspaces.* ∗*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.* diff --git a/docs/core-parrotos-7/description.txt b/docs/core-parrotos-7/description.txt new file mode 100644 index 0000000..3c1e077 --- /dev/null +++ b/docs/core-parrotos-7/description.txt @@ -0,0 +1 @@ +Parrot OS 7 base image for Kasm Workspaces diff --git a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 690238f..0000000 --- a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index d60e3c4..0000000 --- a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 690238f..0000000 --- a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index d60e3c4..0000000 --- a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 690238f..0000000 --- a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index d60e3c4..0000000 --- a/src/fedora39/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 690238f..0000000 --- a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index d60e3c4..0000000 --- a/src/fedora40/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 690238f..0000000 --- a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index d60e3c4..0000000 --- a/src/fedora41/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/oracle7/xfce/.config/.blank b/src/oracle7/xfce/.config/.blank deleted file mode 100644 index e69de29..0000000 diff --git a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 002092d..0000000 --- a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index 8b83794..0000000 --- a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/.blank b/src/oracle8/xfce/.config/.blank deleted file mode 100644 index e69de29..0000000 diff --git a/src/oracle8/xfce/.config/xfce4/fedora-logo-icon.png b/src/oracle8/xfce/.config/xfce4/fedora-logo-icon.png deleted file mode 100644 index 92c8299..0000000 Binary files a/src/oracle8/xfce/.config/xfce4/fedora-logo-icon.png and /dev/null differ diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index 48590c9..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index a3277e2..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfwm4.xml b/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index e82f0c6..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index a34dc3c..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 34f01f3..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml deleted file mode 100644 index a87af71..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index ba3c831..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index 8b83794..0000000 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/parrotos6/xfce/.config/xfce4/panel/launcher-10/17053571248.desktop b/src/parrotos7/xfce/.config/xfce4/panel/launcher-10/17053571248.desktop similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/panel/launcher-10/17053571248.desktop rename to src/parrotos7/xfce/.config/xfce4/panel/launcher-10/17053571248.desktop diff --git a/src/parrotos6/xfce/.config/xfce4/panel/launcher-9/17053568355.desktop b/src/parrotos7/xfce/.config/xfce4/panel/launcher-9/17053568355.desktop similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/panel/launcher-9/17053568355.desktop rename to src/parrotos7/xfce/.config/xfce4/panel/launcher-9/17053568355.desktop diff --git a/src/parrotos6/xfce/.config/xfce4/panel/launcher-9/17053568406.desktop b/src/parrotos7/xfce/.config/xfce4/panel/launcher-9/17053568406.desktop similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/panel/launcher-9/17053568406.desktop rename to src/parrotos7/xfce/.config/xfce4/panel/launcher-9/17053568406.desktop diff --git a/src/parrotos6/xfce/.config/xfce4/panel/whiskermenu-4.rc b/src/parrotos7/xfce/.config/xfce4/panel/whiskermenu-4.rc similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/panel/whiskermenu-4.rc rename to src/parrotos7/xfce/.config/xfce4/panel/whiskermenu-4.rc diff --git a/src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from src/parrotos6/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to src/parrotos7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index cd38ea9..04f2e37 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -4,13 +4,7 @@ set -ex ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') echo "Install Audio Requirements" -if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - yum install -y curl git - yum install -y epel-release - yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm - yum install -y ffmpeg pulseaudio-utils - sed -i '/Bluetooth/,+7d' /etc/pulse/default.pa -elif [ "${DISTRO}" == "oracle8" ]; then +if [ "${DISTRO}" == "oracle8" ]; then dnf install -y curl git dnf config-manager --set-enabled ol8_codeready_builder dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm @@ -28,26 +22,6 @@ elif [[ "${DISTRO}" == @(rockylinux9|almalinux9) ]]; then elif [[ "${DISTRO}" == @(rockylinux8|almalinux8) ]]; then dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm dnf install -y --allowerasing ffmpeg pulseaudio-utils pulseaudio -elif [ "${DISTRO}" == "fedora37" ]; then - dnf install -y curl git - dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm - dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils -elif [ "${DISTRO}" == "fedora38" ]; then - dnf install -y curl git - dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-38.noarch.rpm - dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils -elif [ "${DISTRO}" == "fedora39" ]; then - dnf install -y curl git - dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm - dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils -elif [ "${DISTRO}" == "fedora40" ]; then - dnf install -y curl git - dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm - dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils -elif [ "${DISTRO}" == "fedora41" ]; then - dnf install -y curl git - dnf-3 localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm - dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils elif [ "${DISTRO}" == "fedora42" ]; then dnf install -y curl git dnf-3 localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-42.noarch.rpm @@ -56,11 +30,11 @@ elif [ "${DISTRO}" == "fedora43" ]; then dnf install -y curl git dnf-3 localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-43.noarch.rpm dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils -elif [ "${DISTRO}" == "opensuse" ]; then +elif [ "${DISTRO}" == opensuse ]; then zypper install -ny curl git zypper install -yn ffmpeg pulseaudio-utils elif [ "${DISTRO}" == "alpine" ]; then - if grep -q v3.19 /etc/os-release || grep -q v3.20 /etc/os-release || grep -q v3.21 /etc/os-release; then + if grep -q v3.20 /etc/os-release || grep -q v3.21 /etc/os-release; then apk add --no-cache \ ffmpeg \ ffplay \ diff --git a/src/ubuntu/install/cleanup/cleanup.sh b/src/ubuntu/install/cleanup/cleanup.sh index f2e5ee0..42b273f 100644 --- a/src/ubuntu/install/cleanup/cleanup.sh +++ b/src/ubuntu/install/cleanup/cleanup.sh @@ -2,13 +2,11 @@ set -ex # Distro package cleanup -if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - yum clean all -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|fedora41|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then +if [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora42|fedora43|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then dnf clean all elif [ "${DISTRO}" == "opensuse" ]; then zypper clean --all -elif [[ "${DISTRO}" == @(debian|kali|parrotos6|ubuntu) ]]; then +elif [[ "${DISTRO}" == @(debian|kali|parrotos7|ubuntu) ]]; then # Uninstall unneccesary/vulnerable packages dpkg --purge ipp-usb #KASM-5266 apt-get autoremove -y diff --git a/src/ubuntu/install/fonts/install_custom_fonts.sh b/src/ubuntu/install/fonts/install_custom_fonts.sh index 3bed68d..af1e788 100644 --- a/src/ubuntu/install/fonts/install_custom_fonts.sh +++ b/src/ubuntu/install/fonts/install_custom_fonts.sh @@ -9,18 +9,7 @@ LOCALES_UBUNTU="language-pack-af language-pack-am language-pack-an language-pack LOCALES="aa_DJ aa_ER aa_ET af_ZA am_ET an_ES ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_TN ar_YE as_IN ast_ES ayc_PE az_AZ be_BY bem_ZM ber_DZ ber_MA bg_BG bho_IN bn_BD bn_IN bo_CN bo_IN br_FR brx_IN bs_BA byn_ER ca_AD ca_ES ca_FR ca_IT crh_UA csb_PL cs_CZ cv_RU cy_GB da_DK de_AT de_BE de_CH de_DE de_LU doi_IN dv_MV dz_BT el_CY el_GR en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_US en_ZA en_ZM en_ZW es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_ES es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE et_EE eu_ES fa_IR ff_SN fi_FI fil_PH fo_FO fr_BE fr_CA fr_CH fr_FR fr_LU fur_IT fy_DE fy_NL ga_IE gd_GB gez_ER gez_ET gl_ES gu_IN gv_GB ha_NG he_IL hi_IN hne_IN hr_HR hsb_DE ht_HT hu_HU hy_AM ia_FR id_ID ig_NG ik_CA is_IS it_CH it_IT iu_CA ja_JP ka_GE kk_KZ kl_GL km_KH kn_IN kok_IN ko_KR ks_IN ku_TR kw_GB ky_KG lb_LU lg_UG li_BE lij_IT li_NL lo_LA lt_LT lv_LV mag_IN mai_IN mg_MG mhr_RU mi_NZ mk_MK ml_IN mni_IN mn_MN mr_IN ms_MY mt_MT my_MM nb_NO nds_DE nds_NL ne_NP nhn_MX niu_NU niu_NZ nl_AW nl_BE nl_NL nn_NO nr_ZA nso_ZA oc_FR om_ET om_KE or_IN os_RU pa_IN pa_PK pl_PL ps_AF pt_BR pt_PT ro_RO ru_RU ru_UA rw_RW sa_IN sat_IN sc_IT sd_IN se_NO shs_CA sid_ET si_LK sk_SK sl_SI so_DJ so_ET so_KE so_SO sq_AL sq_MK sr_ME sr_RS ss_ZA st_ZA sv_FI sv_SE sw_KE sw_TZ szl_PL ta_IN ta_LK te_IN tg_TJ th_TH ti_ER ti_ET tig_ER tk_TM tl_PH tn_ZA tr_CY tr_TR ts_ZA tt_RU ug_CN uk_UA unm_US ur_IN ur_PK uz_UZ ve_ZA vi_VN wa_BE wae_CH wal_ET wo_SN xh_ZA yi_US yo_NG yue_HK zh_CN zh_HK zh_SG zh_TW zu_ZA" echo "Installing fonts and languages" -if [[ "${DISTRO}" == "oracle7" ]]; then - yum-config-manager --enable ol7_optional_latest - yum install -y \ - google-noto-emoji-fonts \ - google-noto-sans-cjk-fonts \ - google-noto-sans-fonts -elif [[ "${DISTRO}" == "centos" ]]; then - yum install -y \ - google-noto-emoji-fonts \ - google-noto-sans-cjk-fonts \ - google-noto-sans-fonts -elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43) ]]; then +if [[ "${DISTRO}" == @(fedora42|fedora43) ]]; then dnf install -y \ glibc-locale-source \ google-noto-cjk-fonts \ @@ -43,8 +32,13 @@ elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8 done elif [ "${DISTRO}" == "opensuse" ]; then - zypper addrepo -G \ - https://download.opensuse.org/repositories/M17N:/fonts/15.6/ fonts-x86_64 + if $(grep -q "15.6" /etc/os-release); then + zypper addrepo -G \ + https://download.opensuse.org/repositories/M17N:/fonts/15.6/ fonts-x86_64 + elif $(grep -q "16" /etc/os-release); then + zypper addrepo -G \ + https://download.opensuse.org/repositories/M17N:/fonts/16.0/ fonts-x86_64 + fi zypper install -ny \ glibc-i18ndata \ glibc-locale \ @@ -60,7 +54,7 @@ elif [ "${DISTRO}" == "alpine" ]; then font-noto-all \ font-noto-cjk \ font-noto-emoji -elif [[ "${DISTRO}" == @(debian|parrotos6|kali) ]]; then +elif [[ "${DISTRO}" == @(debian|parrotos7|kali) ]]; then apt-get update apt-get install -y \ fonts-noto-core \ @@ -71,14 +65,6 @@ elif [[ "${DISTRO}" == @(debian|parrotos6|kali) ]]; then echo "Generating Locale for ${LOCALE}" localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8 done -elif $(grep -q Bionic /etc/os-release); then - apt-get update - apt-get install -y \ - fonts-noto-cjk \ - fonts-noto-color-emoji \ - fonts-noto-hinted \ - fonts-noto-unhinted \ - ${LOCALES_UBUNTU} else apt-get update apt-get install -y \ diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 3505114..cc4d6f3 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -37,8 +37,6 @@ then else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_${KASM_VER_NAME_PART}_arm64.deb" fi -elif [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_centos_core_${KASM_VER_NAME_PART}_x86_64.rpm" elif [[ "${DISTRO}" == @(rockylinux8|oracle8|almalinux8) ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_8_${KASM_VER_NAME_PART}_x86_64.rpm" @@ -52,40 +50,18 @@ elif [[ "${DISTRO}" == @(rockylinux9|oracle9|rhel9|almalinux9) ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_9_${KASM_VER_NAME_PART}_aarch64.rpm" fi elif [[ "${DISTRO}" == "opensuse" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_aarch64.rpm" - fi -elif [[ "${DISTRO}" == "fedora37" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_aarch64.rpm" - fi -elif [[ "${DISTRO}" == "fedora38" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyeight_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyeight_${KASM_VER_NAME_PART}_aarch64.rpm" - fi -elif [[ "${DISTRO}" == "fedora39" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtynine_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtynine_${KASM_VER_NAME_PART}_aarch64.rpm" - fi -elif [[ "${DISTRO}" == "fedora40" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_40_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_40_${KASM_VER_NAME_PART}_aarch64.rpm" - fi -elif [[ "${DISTRO}" == "fedora41" ]] ; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_41_${KASM_VER_NAME_PART}_x86_64.rpm" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_41_${KASM_VER_NAME_PART}_aarch64.rpm" + if $(grep -q "15.6" /etc/os-release);then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_x86_64.rpm" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_aarch64.rpm" + fi + elif $(grep -q "16" /etc/os-release);then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_16_${KASM_VER_NAME_PART}_x86_64.rpm" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_16_${KASM_VER_NAME_PART}_aarch64.rpm" + fi fi elif [[ "${DISTRO}" == "fedora42" ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then @@ -99,8 +75,8 @@ elif [[ "${DISTRO}" == "fedora43" ]] ; then else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_43_${KASM_VER_NAME_PART}_aarch64.rpm" fi -elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then - if $(grep -q trixie /etc/os-release); then +elif [[ "${DISTRO}" = @(debian|parrotos7) ]] ; then + if grep -q trixie /etc/os-release || { grep -qi parrot /etc/os-release && grep -q "7.1" /etc/os-release; }; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_trixie_${KASM_VER_NAME_PART}_amd64.deb" else @@ -120,24 +96,24 @@ elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then fi fi elif [[ "${DISTRO}" == "alpine" ]] ; then - if grep -q v3.21 /etc/os-release; then + if grep -q v3.23 /etc/os-release; then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_323_${KASM_VER_NAME_PART}_x86_64.apk" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_323_${KASM_VER_NAME_PART}_aarch64.apk" + fi + elif grep -q v3.22 /etc/os-release; then + if [[ "$(arch)" =~ ^x86_64$ ]] ; then + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_322_${KASM_VER_NAME_PART}_x86_64.apk" + else + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_322_${KASM_VER_NAME_PART}_aarch64.apk" + fi + elif grep -q v3.21 /etc/os-release; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_x86_64.apk" else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_321_${KASM_VER_NAME_PART}_aarch64.apk" fi - elif grep -q v3.20 /etc/os-release; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_x86_64.apk" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_320_${KASM_VER_NAME_PART}_aarch64.apk" - fi - elif grep -q v3.19 /etc/os-release; then - if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_x86_64.apk" - else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_alpine_319_${KASM_VER_NAME_PART}_aarch64.apk" - fi fi else UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release) @@ -150,22 +126,18 @@ fi prepare_rpm_repo_dependencies -if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - wget "${BUILD_URL}" -O kasmvncserver.rpm - yum localinstall -y kasmvncserver.rpm - rm kasmvncserver.rpm -elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]] ; then +if [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]] ; then wget "${BUILD_URL}" -O kasmvncserver.rpm dnf localinstall -y kasmvncserver.rpm dnf install -y mesa-dri-drivers rm kasmvncserver.rpm -elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43) ]] ; then +elif [[ "${DISTRO}" == @(fedora42|fedora43) ]] ; then dnf install -y xorg-x11-drv-amdgpu xorg-x11-drv-ati if [ "${BUILD_ARCH}" == "x86_64" ]; then dnf install -y xorg-x11-drv-intel fi wget "${BUILD_URL}" -O kasmvncserver.rpm - if [[ "${DISTRO}" == @(fedora41|fedora42|fedora43) ]] ; then + if [[ "${DISTRO}" == @(fedora42|fedora43) ]] ; then dnf-3 localinstall -y --allowerasing kasmvncserver.rpm dnf install -y crypto-policies-scripts update-crypto-policies --set DEFAULT:SHA1 diff --git a/src/ubuntu/install/kde/install_kde.sh b/src/ubuntu/install/kde/install_kde.sh index 5864d8d..e849f1c 100644 --- a/src/ubuntu/install/kde/install_kde.sh +++ b/src/ubuntu/install/kde/install_kde.sh @@ -30,11 +30,11 @@ EOL } echo "Install KDE UI components" -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|opensuse|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi -if [[ "$DISTRO" = @(ubuntu|debian|parrotos5) ]]; then +if [[ "$DISTRO" = @(ubuntu|debian|parrotos7) ]]; then apt-get install -y x11-utils apt-get install -y --no-install-recommends \ curl \ @@ -62,18 +62,6 @@ if [[ "$DISTRO" = @(ubuntu|debian|parrotos5) ]]; then kde-config-screenlocker echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen locale-gen -elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then - if [ "${DISTRO}" == centos ]; then - yum install -y epel-release - else - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - fi - disable_epel_nss_wrapper_that_breaks_firefox - yum install -y \ - curl \ - wmctrl \ - xclip \ - xset elif [ "$DISTRO" = "oracle8" ]; then dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf install -y \ @@ -117,7 +105,7 @@ elif [ "$DISTRO" = "opensuse" ]; then gvfs \ xclip \ xset -elif [[ "$DISTRO" = @(fedora37|fedora38) ]]; then +elif [[ "$DISTRO" = @(fedora42|fedora43) ]]; then dnf install -y \ curl \ gvfs \ @@ -134,7 +122,7 @@ elif [ "$DISTRO" = "alpine" ]; then mesa-gl fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start diff --git a/src/ubuntu/install/openbox/install_openbox.sh b/src/ubuntu/install/openbox/install_openbox.sh index f5aa040..19b3078 100644 --- a/src/ubuntu/install/openbox/install_openbox.sh +++ b/src/ubuntu/install/openbox/install_openbox.sh @@ -30,11 +30,11 @@ EOL } echo "Install Openbox UI components" -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|opensuse|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi -if [[ "$DISTRO" = @(ubuntu|debian|parrotos5) ]]; then +if [[ "$DISTRO" = @(ubuntu|debian|parrotos7) ]]; then apt-get install -y x11-utils apt-get install -y --no-install-recommends \ curl \ @@ -45,20 +45,6 @@ if [[ "$DISTRO" = @(ubuntu|debian|parrotos5) ]]; then xterm echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen locale-gen -elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then - if [ "${DISTRO}" == centos ]; then - yum install -y epel-release - else - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - fi - disable_epel_nss_wrapper_that_breaks_firefox - yum install -y \ - curl \ - openbox \ - wmctrl \ - xclip \ - xset \ - xterm elif [ "$DISTRO" = "oracle8" ]; then dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf install -y \ @@ -112,7 +98,7 @@ elif [ "$DISTRO" = "opensuse" ]; then xclip \ xset \ xterm -elif [[ "$DISTRO" = @(fedora37|fedora38) ]]; then +elif [[ "$DISTRO" = @(fedora42|fedora43) ]]; then dnf install -y \ curl \ gvfs \ @@ -133,7 +119,7 @@ elif [ "$DISTRO" = "alpine" ]; then xterm fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start diff --git a/src/ubuntu/install/package_rules/package_rules.sh b/src/ubuntu/install/package_rules/package_rules.sh index f34fac8..ef4042c 100644 --- a/src/ubuntu/install/package_rules/package_rules.sh +++ b/src/ubuntu/install/package_rules/package_rules.sh @@ -9,20 +9,12 @@ elif [[ "${DISTRO}" == "debian" ]] ; then sed -i \ '/locale/d' \ /etc/dpkg/dpkg.cfg.d/docker -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then +elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora42|fedora43|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then rm -f /etc/rpm/macros.image-language-conf -elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then - sed -i \ - '/override_install_langs/d' \ - /etc/yum.conf - yum reinstall -y \ - glibc-common fi echo "Upgrading packages from upstream base image" -if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - yum update -y -elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then +if [[ "${DISTRO}" == @(fedora42|fedora43|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then dnf upgrade -y --refresh elif [ "${DISTRO}" == "opensuse" ]; then zypper --non-interactive patch --auto-agree-with-licenses diff --git a/src/ubuntu/install/printer/install_printer.sh b/src/ubuntu/install/printer/install_printer.sh index d270541..1045787 100755 --- a/src/ubuntu/install/printer/install_printer.sh +++ b/src/ubuntu/install/printer/install_printer.sh @@ -4,9 +4,7 @@ set -e echo $DISTRO -if [ "${DISTRO}" == "oracle7" ] || [ "${DISTRO}" == "centos" ]; then - yum install -y cups cups-client cups-pdf -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43) ]]; then +if [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora42|fedora43) ]]; then dnf install -y cups cups-client cups-pdf elif [ "${DISTRO}" == "opensuse" ]; then zypper install -y cups cups-client cups-pdf diff --git a/src/ubuntu/install/profile_sync/install_profile_sync.sh b/src/ubuntu/install/profile_sync/install_profile_sync.sh index 4872b0f..be51246 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -36,7 +36,13 @@ handle_other_distros_conversion() { case "$DISTRO" in kali) profile_distro="kali_kali-rolling" ;; - opensuse) profile_distro="opensuse_15" + opensuse) + if grep -q '15.6' /etc/os-release; then + profile_distro="opensuse_15" + fi + if grep -q '16' /etc/os-release; then + profile_distro="opensuse_16" + fi ;; alpine) if grep -q 'v3.17' /etc/os-release; then diff --git a/src/ubuntu/install/smartcard/install_smartcard.sh b/src/ubuntu/install/smartcard/install_smartcard.sh index 69a697b..6b1574c 100755 --- a/src/ubuntu/install/smartcard/install_smartcard.sh +++ b/src/ubuntu/install/smartcard/install_smartcard.sh @@ -7,9 +7,7 @@ BRANCH="main" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') -if [[ "${DISTRO}" == @(centos|oracle7) ]]; then - yum install -y wget nss-tools glib2 -elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43) ]]; then +if [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora42|fedora43) ]]; then dnf install -y wget nss-tools glib2 elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn wget mozilla-nss-tools libglib-2_0-0 diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index d875d75..21c17f5 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -3,7 +3,7 @@ set -ex # Install openssl ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') -if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|almalinux8|almalinux9|rockylinux8|rockylinux9) ]]; then +if [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|fedora42|fedora43|almalinux8|almalinux9|rockylinux8|rockylinux9) ]]; then dnf install -y openssl xkbcomp rm -f /etc/X11/xinit/xinitrc elif [[ "${DISTRO}" == "alpine" ]]; then @@ -26,7 +26,7 @@ else fi # Update squid conf with user info -if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then +if [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|fedora42|fedora43|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy elif [ "${DISTRO}" == "opensuse" ]; then useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy @@ -51,9 +51,7 @@ EOL chown -R proxy:proxy /etc/squid/blocked.acl -if [[ "${DISTRO}" == @(centos|oracle7) ]]; then - yum install -y memcached cyrus-sasl iproute -elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then +if [[ "${DISTRO}" == @(oracle8|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then dnf install -y memcached cyrus-sasl iproute elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn memcached cyrus-sasl iproute2 libatomic1 @@ -90,9 +88,7 @@ chmod +x /etc/squid/kasm_squid_adapter # FIXME - This likely should be moved somewhere else to be more explicit # Install Cert utilities -if [[ "${DISTRO}" == @(centos|oracle7) ]]; then - yum install -y nss-tools -elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then +if [[ "${DISTRO}" == @(oracle8|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then dnf install -y nss-tools elif [ "${DISTRO}" == "opensuse" ]; then zypper install -yn mozilla-nss-tools diff --git a/src/ubuntu/install/squid/resources/start_squid.sh b/src/ubuntu/install/squid/resources/start_squid.sh index 54f9bbc..d56e67c 100644 --- a/src/ubuntu/install/squid/resources/start_squid.sh +++ b/src/ubuntu/install/squid/resources/start_squid.sh @@ -9,21 +9,19 @@ set -ex mkdir -p /tmp/working_certs cd /tmp/working_certs - if [ -f /etc/centos-release ]; then - DISTRO=centos - elif [ -f /etc/fedora-release ]; then + if [ -f /etc/fedora-release ]; then DISTRO=fedora elif [ -f /etc/oracle-release ] || [ -f /etc/rocky-release ] || [ -f /etc/almalinux-release ] || [ -f /etc/redhat-release ]; then DISTRO=oracle7 elif [ -f /usr/bin/zypper ]; then DISTRO=opensuse elif [ -f /etc/dpkg/origins/parrot ]; then - DISTRO=parrotos6 + DISTRO=parrotos7 elif [ -f /etc/alpine-release ]; then DISTRO=alpine fi - if [[ "${DISTRO}" == @(centos|oracle7|fedora) ]]; then + if [[ "${DISTRO}" == @(fedora) ]]; then CERT_FILE=/etc/pki/ca-trust/source/anchors/squid.crt elif [ "${DISTRO}" == "opensuse" ]; then CERT_FILE=/usr/share/pki/trust/anchors/squid.crt @@ -44,7 +42,7 @@ set -ex fi chmod 644 ${CERT_FILE} - if [[ "${DISTRO}" == @(centos|oracle7|fedora) ]]; then + if [[ "${DISTRO}" == @(fedora) ]]; then update-ca-trust else update-ca-certificates @@ -63,7 +61,7 @@ set -ex export MEMCACHE_PASSWORD="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 13 )" echo $MEMCACHE_PASSWORD | saslpasswd2 -a memcached -c -f /etc/sasl2/memcached-sasldb2 kasm - if [[ "${DISTRO}" == @(centos|oracle7|opensuse|fedora|alpine) ]]; then + if [[ "${DISTRO}" == @(opensuse|fedora|alpine) ]]; then MEMCACHE_USER=memcached else MEMCACHE_USER=memcache @@ -71,7 +69,7 @@ set -ex chown $MEMCACHE_USER:$MEMCACHE_USER /etc/sasl2/memcached-sasldb2 - if [[ "${DISTRO}" == @(centos|oracle7|fedora|parrotos6|alpine) ]]; then + if [[ "${DISTRO}" == @(fedora|parrotos7|alpine) ]]; then /usr/bin/memcached -u $MEMCACHE_USER & elif [ "${DISTRO}" == "opensuse" ]; then /usr/sbin/memcached -u $MEMCACHE_USER & diff --git a/src/ubuntu/install/sysbox/install_systemd.sh b/src/ubuntu/install/sysbox/install_systemd.sh index 373b144..386c8a4 100644 --- a/src/ubuntu/install/sysbox/install_systemd.sh +++ b/src/ubuntu/install/sysbox/install_systemd.sh @@ -2,7 +2,7 @@ set -ex # Setup systemd based on distro type -if [[ "${DISTRO}" == @(ubuntu|debian|parrotos6|kali) ]] ; then +if [[ "${DISTRO}" == @(ubuntu|debian|parrotos7|kali) ]] ; then # Install deps apt-get update apt-get install -y --no-install-recommends \ @@ -15,7 +15,7 @@ if [[ "${DISTRO}" == @(ubuntu|debian|parrotos6|kali) ]] ; then systemd \ systemd-sysv \ udev -elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40|fedora41) ]]; then +elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora42|fedora43) ]]; then # Install deps dnf install -y \ dbus \ diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index 976bb66..132cf4b 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -1,14 +1,12 @@ #!/usr/bin/env bash set -e -if [ "${DISTRO}" == "parrotos6" ]; then +if [ "${DISTRO}" == "parrotos7" ]; then PARROTEXTRA="-t lory-backports" fi echo "Install some common tools for further installation" -if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then - yum install -y vim wget net-tools bzip2 ca-certificates bc vulkan-tools -elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then +if [[ "${DISTRO}" == @(fedora42|fedora43|oracle8|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then dnf install -y wget net-tools bzip2 tar vim hostname procps-ng bc vulkan-tools elif [[ "${DISTRO}" == @(rhel9) ]]; then dnf install -y wget net-tools bzip2 tar vim hostname procps-ng bc @@ -42,7 +40,7 @@ else dpkg-reconfigure --frontend noninteractive tzdata # software-properties is removed from kali-rolling and debian trixie - if grep -q "kali-rolling" /etc/os-release || grep -q "trixie" /etc/os-release; then + if grep -q "kali-rolling" /etc/os-release || grep -q "trixie" /etc/os-release || grep -qi "parrot" /etc/os-release; then apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl mesa-utils bc vulkan-tools else apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl software-properties-common mesa-utils bc vulkan-tools diff --git a/src/ubuntu/install/xfce/install_xfce_ui.sh b/src/ubuntu/install/xfce/install_xfce_ui.sh index cc2c794..02cc6dc 100644 --- a/src/ubuntu/install/xfce/install_xfce_ui.sh +++ b/src/ubuntu/install/xfce/install_xfce_ui.sh @@ -30,7 +30,7 @@ EOL } echo "Install Xfce4 UI components" -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|opensuse|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then apt-get update fi @@ -72,7 +72,7 @@ elif [[ "$DISTRO" = @(ubuntu|debian) ]]; then xfce4-terminal \ xterm \ xclip -elif [[ "$DISTRO" = "parrotos6" ]]; then +elif [[ "$DISTRO" = "parrotos7" ]]; then apt-get install -y \ dbus-x11 \ desktop-base \ @@ -87,20 +87,6 @@ elif [[ "$DISTRO" = "parrotos6" ]]; then xfce4-whiskermenu-plugin echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen locale-gen -elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then - if [ "${DISTRO}" == centos ]; then - yum install -y epel-release - else - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - fi - disable_epel_nss_wrapper_that_breaks_firefox - yum groupinstall xfce -y - yum install -y \ - gvfs \ - wmctrl \ - xclip \ - xfce4-notifyd \ - xset elif [ "$DISTRO" = "oracle8" ]; then dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf group install xfce -y @@ -173,7 +159,7 @@ elif [ "$DISTRO" = "opensuse" ]; then xset # Pidof is no longer shipped in OpenSuse ln -s /usr/bin/pgrep /usr/bin/pidof -elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43) ]]; then +elif [[ "$DISTRO" = @(fedora42|fedora43) ]]; then dnf install -y \ dbus-tools \ dbus-x11 \ @@ -230,7 +216,7 @@ Exec=/usr/lib/xfce4/notifyd/xfce4-notifyd EOL fi -if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then +if [[ "${DISTRO}" != @(oracle8|fedora42|fedora43|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then replace_default_xinit if [ "${START_XFCE4}" == "1" ] ; then replace_default_99x11_common_start