From 6c203f23a7c2bb3d117aeea0224b70f827297051 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" Date: Mon, 11 Sep 2023 22:24:38 +0300 Subject: [PATCH] Move to new branding --- .github/workflows/release_i386.yml | 7 +- basefiles/debian/changelog | 6 ++ basefiles/etc/legal | 4 + basefiles/logos/pika-logo-duotone.svg | 83 +++++++++++++++ basefiles/logos/pika-logo-text-dark.svg | 105 ++++++++++++++++--- basefiles/logos/pika-logo-text.svg | 108 +++++++++++++++++--- basefiles/logos/pika-logo.svg | 129 +++++++++++++----------- basefiles/motd/10-help-text | 4 +- main.sh | 3 +- main32.sh | 13 +-- 10 files changed, 357 insertions(+), 105 deletions(-) create mode 100644 basefiles/logos/pika-logo-duotone.svg diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml index eea72cc..e126587 100644 --- a/.github/workflows/release_i386.yml +++ b/.github/workflows/release_i386.yml @@ -1,4 +1,4 @@ -name: PikaOS Package Release (i386) +name: PikaOS Package Release on: workflow_dispatch @@ -7,16 +7,13 @@ jobs: build: runs-on: self-hosted container: - image: ubuntu:23.04 + image: ghcr.io/pikaos-linux/pika-i386-package-container:latest volumes: - /proc:/proc options: --privileged -it steps: - uses: actions/checkout@v3 - - - name: Install needed packages - run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y - name: Import GPG key id: import_gpg diff --git a/basefiles/debian/changelog b/basefiles/debian/changelog index effec05..d42e3d9 100644 --- a/basefiles/debian/changelog +++ b/basefiles/debian/changelog @@ -1,3 +1,9 @@ +base-files (12.3ubuntu99-99pika3) lunar; urgency=medium + + * Update to new branding + + -- Ward Nakchbandi Sat, 15 Oct 2022 20:50:00 +0300 + base-files (12.3ubuntu99-99pika2) lunar; urgency=medium * Upgrade to lunar diff --git a/basefiles/etc/legal b/basefiles/etc/legal index 5c7b347..4ba2c15 100644 --- a/basefiles/etc/legal +++ b/basefiles/etc/legal @@ -1 +1,5 @@ +PikaOS Copyright and EULA 2022 - 2023: + ILLEGAL! +POLICE HANDS UP! GET ON THE FUCKING GROUND!!!!! +WE GOT YOU YOU BITCH. diff --git a/basefiles/logos/pika-logo-duotone.svg b/basefiles/logos/pika-logo-duotone.svg new file mode 100644 index 0000000..2d8c812 --- /dev/null +++ b/basefiles/logos/pika-logo-duotone.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + diff --git a/basefiles/logos/pika-logo-text-dark.svg b/basefiles/logos/pika-logo-text-dark.svg index a3d6d14..cf68a77 100644 --- a/basefiles/logos/pika-logo-text-dark.svg +++ b/basefiles/logos/pika-logo-text-dark.svg @@ -1,15 +1,94 @@ - - pika-logo-text-dark-svg - - - - - - diff --git a/basefiles/logos/pika-logo-text.svg b/basefiles/logos/pika-logo-text.svg index 8d0cd94..0c684cd 100644 --- a/basefiles/logos/pika-logo-text.svg +++ b/basefiles/logos/pika-logo-text.svg @@ -1,15 +1,95 @@ - - pika-logo-text-svg - - - - - - diff --git a/basefiles/logos/pika-logo.svg b/basefiles/logos/pika-logo.svg index a1ec6d3..6e9fe67 100644 --- a/basefiles/logos/pika-logo.svg +++ b/basefiles/logos/pika-logo.svg @@ -1,59 +1,70 @@ - - pika-logo-svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/basefiles/motd/10-help-text b/basefiles/motd/10-help-text index e909b9b..fe8f5ba 100755 --- a/basefiles/motd/10-help-text +++ b/basefiles/motd/10-help-text @@ -1,3 +1,5 @@ #!/bin/sh -printf "911 what's your emergency?\n" +printf "PikaOS Police: 911 what's your emergency?\n" +printf "You: I Did Something Really stupid... plz save me.\n" +printf "PikaOS Police: https://discord.gg/6HKR2YRvNg\n" diff --git a/main.sh b/main.sh index 1a669eb..e37f69c 100755 --- a/main.sh +++ b/main.sh @@ -5,8 +5,7 @@ cd ./basefiles apt-get build-dep ./ -y # Build package -LOGNAME=root dh_make --createorig -y -l -p base-files_12.3ubuntu99 -dpkg-buildpackage +dpkg-buildpackage --no-sign # Move the debs to output cd ../ diff --git a/main32.sh b/main32.sh index d1d903b..e37f69c 100755 --- a/main32.sh +++ b/main32.sh @@ -1,20 +1,11 @@ -# Add dependent repositories -sudo dpkg --add-architecture i386 -wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add - -add-apt-repository https://ppa.pika-os.com -add-apt-repository ppa:pikaos/pika -add-apt-repository ppa:kubuntu-ppa/backports - # Clone Upstream cd ./basefiles # Get build deps -apt-get install crossbuild-essential-i386 lib32gcc-11-dev -y -apt-get build-dep ./ -y -a i386 +apt-get build-dep ./ -y # Build package -LOGNAME=root dh_make --createorig -y -l -p base-files_12.2ubuntu99 -dpkg-buildpackage -a i386 +dpkg-buildpackage --no-sign # Move the debs to output cd ../