From 9b8bc7207e055351be9407e946771c03d3f98003 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 1 Aug 2024 16:18:23 +0300 Subject: [PATCH 01/67] port to os 4 --- .github/build-canary-v3 | 1 + .github/build-nest-v3 | 1 + .github/release-canary-v3 | 1 + .github/release-nest-v3 | 1 + .github/workflows/build-canaryv3.yml | 37 ++++++++++++++++++++ .github/workflows/build-nestv3.yml | 37 ++++++++++++++++++++ .github/workflows/release-canaryv3.yml | 40 ++++++++++++++++++++++ .github/workflows/release-nestv3.yml | 40 ++++++++++++++++++++++ .github/workflows/release.yml | 47 -------------------------- LICENSE.md | 24 +++++++++++++ debian/changelog | 6 ++++ debian/rules | 11 +++++- debian/source/format | 2 +- main.sh | 17 ++++++++-- pika-build-config/amd64-v3.sh | 10 ++++++ pika-build-config/i386.sh | 5 +++ release.sh | 8 +---- 17 files changed, 229 insertions(+), 59 deletions(-) create mode 100644 .github/build-canary-v3 create mode 100644 .github/build-nest-v3 create mode 100644 .github/release-canary-v3 create mode 100644 .github/release-nest-v3 create mode 100644 .github/workflows/build-canaryv3.yml create mode 100644 .github/workflows/build-nestv3.yml create mode 100644 .github/workflows/release-canaryv3.yml create mode 100644 .github/workflows/release-nestv3.yml delete mode 100644 .github/workflows/release.yml create mode 100644 LICENSE.md mode change 100644 => 100755 main.sh create mode 100755 pika-build-config/amd64-v3.sh create mode 100755 pika-build-config/i386.sh mode change 100644 => 100755 release.sh diff --git a/.github/build-canary-v3 b/.github/build-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.github/release-canary-v3 @@ -0,0 +1 @@ +1 diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml new file mode 100644 index 0000000..bff3d86 --- /dev/null +++ b/.github/workflows/build-canaryv3.yml @@ -0,0 +1,37 @@ +name: PikaOS Package Build Only (Canary) (amd64-v3) + +on: + push: + branches: + - main + paths: + - '.github/build-canary-v3' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + + - name: Update APT Cache + run: apt-get update -y + + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml new file mode 100644 index 0000000..3c9c34d --- /dev/null +++ b/.github/workflows/build-nestv3.yml @@ -0,0 +1,37 @@ +name: PikaOS Package Build Only (amd64-v3) + +on: + push: + branches: + - main + paths: + - '.github/build-nest-v3' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + + - name: Update APT Cache + run: apt-get update -y + + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml new file mode 100644 index 0000000..436c8ff --- /dev/null +++ b/.github/workflows/release-canaryv3.yml @@ -0,0 +1,40 @@ +name: PikaOS Package Build & Release (Canary) (amd64-v3) + +on: + push: + branches: + - main + paths: + - '.github/release-canary-v3' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + + - name: Update APT Cache + run: apt-get update -y + + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh + + - name: Release Package + run: ./release.sh diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml new file mode 100644 index 0000000..ed42bb7 --- /dev/null +++ b/.github/workflows/release-nestv3.yml @@ -0,0 +1,40 @@ +name: PikaOS Package Build & Release (amd64-v3) + +on: + push: + branches: + - main + paths: + - '.github/release-nest-v3' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + + - name: Update APT Cache + run: apt-get update -y + + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh + + - name: Release Package + run: ./release.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 8d34d97..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: PikaOS Package Release - -on: - workflow_dispatch - -jobs: - build: - runs-on: self-hosted - container: - image: ghcr.io/pikaos-linux/pika-package-container:latest - volumes: - - /proc:/proc - options: --privileged -it - - steps: - - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Build Package - run: chmod +x ./main.sh && ./main.sh - - - name: Release Package - run: chmod +x ./release.sh && ./release.sh - - - name: Purge cache - uses: strrife/cloudflare-chunked-purge-action@master - env: - # Zone is required by both authentication methods - CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }} - - CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} - PURGE_URLS: ${{ vars.PURGE_URLS }} - \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..16ff30b --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,24 @@ +MIT License (With DPKG packaging compatibility) + +Copyright (c) 2024 PikaOS + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Notes: +The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT. diff --git a/debian/changelog b/debian/changelog index ad1348d..853c97f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-first-setup (1.0.1-101pika1) pika; urgency=low + + * Just rebuild for OS4 + + -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 + pika-first-setup (1.0.1-100pika5) pikauwu; urgency=low * First release diff --git a/debian/rules b/debian/rules index aa23fea..00c25af 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,16 @@ ## Output every command that modifies files on the build system. export DH_VERBOSE = 1 -export PATH := "/root/.cargo/bin:$(PWD):$(PATH)" +export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch) +export PATH := $(PATH):/root/.cargo/bin + +override_dh_prep: +# amd64 build prep +ifeq (amd64-v3,$(PIKA_BUILD_ARCH)) +# Does not support LTO due to dylib-lto +#export RUSTFLAGS = -C target-cpu=x86-64-v3 -C lto=fat -C embed-bitcode -C codegen-units=1 -C opt-level=3 -Zdylib-lto +export RUSTFLAGS = -C target-cpu=x86-64-v3 -C opt-level=3 +endif %: dh $@ diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/main.sh b/main.sh old mode 100644 new mode 100755 index 5b4d267..47d1f54 --- a/main.sh +++ b/main.sh @@ -1,7 +1,17 @@ +#! /bin/bash + +set -e + +VERSION="1.0.1" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + # Clone Upstream -mkdir -p ./pika-first-setup -rsync -av --progress ./* ./pika-first-setup --exclude ./pika-first-setup -cd ./pika-first-setup +mkdir -p pika-first-setup +cp -rvf ./* ./pika-first-setup/ || true +cd ./pika-first-setup/ # Get build deps apt-get build-dep ./ -y @@ -9,6 +19,7 @@ apt-get install curl -y curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y # Build package +LOGNAME=root dh_make --createorig -y -l -p pika-first-setup_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh new file mode 100755 index 0000000..10285b4 --- /dev/null +++ b/pika-build-config/amd64-v3.sh @@ -0,0 +1,10 @@ +#! /bin/bash +export PIKA_BUILD_ARCH="amd64-v3" +export DEBIAN_FRONTEND="noninteractive" +export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_BUILD_OPTIONS="nocheck notest terse" +export DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/pika-build-config/i386.sh b/pika-build-config/i386.sh new file mode 100755 index 0000000..7629d66 --- /dev/null +++ b/pika-build-config/i386.sh @@ -0,0 +1,5 @@ +#! /bin/bash +export PIKA_BUILD_ARCH="i386" +export DEBIAN_FRONTEND="noninteractive" +export DEB_BUILD_OPTIONS="nocheck notest terse" +export DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/release.sh b/release.sh old mode 100644 new mode 100755 index 1575255..660f48f --- a/release.sh +++ b/release.sh @@ -1,8 +1,2 @@ # send debs to server -rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ - -# add debs to repo -ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/' - -# publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' \ No newline at end of file +rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/ From c2df7862eb624481c26a7fc46cc48fccc00b8551 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 29 Aug 2024 02:15:26 +0300 Subject: [PATCH 02/67] add git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1de5659 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target \ No newline at end of file From a84f08373100a465f4d0179b0137514acc5b7dbe Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 29 Aug 2024 02:58:47 +0300 Subject: [PATCH 03/67] Fix username regex --- .github/release-nest-v3 | 2 +- debian/changelog | 2 +- locales/bg_BG.json | 2 +- locales/cs_CZ.json | 2 +- locales/de_DE.json | 2 +- locales/en_US.json | 2 +- locales/fr_FR.json | 2 +- locales/it_IT.json | 2 +- locales/nl_NL.json | 2 +- locales/sv_SE.json | 2 +- locales/tr_TR.json | 2 +- src/first_setup/codec_carousel/mod.rs | 1 - src/first_setup/driver_carousel/mod.rs | 1 - src/first_setup/final_carousel/mod.rs | 1 - src/first_setup/gameutils_carousel/mod.rs | 1 - src/first_setup/initial_carousel/mod.rs | 1 - src/first_setup/internet_carousel/mod.rs | 5 +- src/first_setup/update_carousel/mod.rs | 2 +- src/first_setup/user_carousel/mod.rs | 138 +++++++++++++++------- 19 files changed, 109 insertions(+), 63 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 853c97f..b5577b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.1-101pika1) pika; urgency=low +pika-first-setup (1.0.1-101pika2) pika; urgency=low * Just rebuild for OS4 diff --git a/locales/bg_BG.json b/locales/bg_BG.json index f37eedc..5081b07 100644 --- a/locales/bg_BG.json +++ b/locales/bg_BG.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Напишете Потребителска парола отново:", "error_label_is_root_label": "Потребителското име не може да е root.", "error_label_is_pikaos_label": "Потребителското име не може да е pikaos.", - "error_label_username_is_special_label": "Потребителското име не може да съдържа специални символи.", + "error_label_username_is_invalid_label": "Потребителското име не може да съдържа специални символи.", "error_label_hostname_is_special_label": "Името на хоста не може да съдържа специални символи или интервали.", "error_label_password_mismatch_label": "Паролите не съвпадат!", "first_setup_gameutils_box_text_title": "PikaOS Геймърски МЕТА Пакет", diff --git a/locales/cs_CZ.json b/locales/cs_CZ.json index 04ee399..c7eb150 100644 --- a/locales/cs_CZ.json +++ b/locales/cs_CZ.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Ověření uživatelského hesla:", "error_label_is_root_label": "Uživatelské jméno nemůže být root.", "error_label_is_pikaos_label": "Uživatelské jméno nemůže být pikaos.", - "error_label_username_is_special_label": "Uživatelské jméno nemůže obsahovat mezery či speciální znaky.", + "error_label_username_is_invalid_label": "Uživatelské jméno nemůže obsahovat mezery či speciální znaky.", "error_label_hostname_is_special_label": "Hostitel nemůže obsahovat mezery či speciální znaky.", "error_label_password_mismatch_label": "Hesla se neshodují!", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta Package", diff --git a/locales/de_DE.json b/locales/de_DE.json index 43012aa..fccfb1f 100644 --- a/locales/de_DE.json +++ b/locales/de_DE.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Gib das Benutzerpasswort erneut ein:", "error_label_is_root_label": "Der Benutzername darf nicht root sein.", "error_label_is_pikaos_label": "Der Benutzername darf nicht pikaos sein.", - "error_label_username_is_special_label": "Der Benutzername darf keine Sonderzeichen oder Leerzeichen enthalten.", + "error_label_username_is_invalid_label": "Der Benutzername darf keine Sonderzeichen oder Leerzeichen enthalten.", "error_label_hostname_is_special_label": "Der Hostname darf keine Sonderzeichen oder Leerzeichen enthalten.", "error_label_password_mismatch_label": "Passwörter stimmen nicht überein!", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta-Paket", diff --git a/locales/en_US.json b/locales/en_US.json index 8b5ecdb..9b07022 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -33,7 +33,7 @@ "user_info_password_verify_title": "Enter User password again:", "error_label_is_root_label": "Username can not be root.", "error_label_is_pikaos_label": "Username can not be pikaos.", - "error_label_username_is_special_label": "Username can not contain special characters or spaces.", + "error_label_username_is_invalid_label": "Username is invalid.", "error_label_hostname_is_special_label": "Hostname can not contain special characters or spaces.", "error_label_password_mismatch_label": "Passwords do not match!", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta Package", diff --git a/locales/fr_FR.json b/locales/fr_FR.json index 80d514a..8564eb4 100644 --- a/locales/fr_FR.json +++ b/locales/fr_FR.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Saisir à nouveau le mot de passe de l'utilisateur:", "error_label_is_root_label": "Le nom d'utilisateur ne peut pas être \"root\".", "error_label_is_pikaos_label": "Le nom d'utilisateur ne peut pas être \"pikaos\".", - "error_label_username_is_special_label": "Le nom d'utilisateur ne peut pas contenir de caractère spécial ou d'espace.", + "error_label_username_is_invalid_label": "Le nom d'utilisateur ne peut pas contenir de caractère spécial ou d'espace.", "error_label_hostname_is_special_label": "Le nom d'hôte ne peut pas contenir de caractère spécial ou d'espace.", "error_label_password_mismatch_label": "Les mots de passe ne correspondent pas !", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta Package", diff --git a/locales/it_IT.json b/locales/it_IT.json index bbca459..6f298b3 100644 --- a/locales/it_IT.json +++ b/locales/it_IT.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Inserisci la password dell'utente un altra volta:", "error_label_is_root_label": "L'username non può essere root.", "error_label_is_pikaos_label": "L'username non può essere pikaos.", - "error_label_username_is_special_label": "", + "error_label_username_is_invalid_label": "", "error_label_hostname_is_special_label": "", "error_label_password_mismatch_label": "Le password non corrispondono!", "first_setup_gameutils_box_text_title": "PikaOS Pacchetto per il Gaming", diff --git a/locales/nl_NL.json b/locales/nl_NL.json index e7f41c0..b291b52 100644 --- a/locales/nl_NL.json +++ b/locales/nl_NL.json @@ -33,7 +33,7 @@ "user_info_password_verify_title": "Voer het gebruikerswachtwoord opnieuw in:", "error_label_is_root_label": "Gebruikersnaam mag geen root zijn.", "error_label_is_pikaos_label": "Gebruikersnaam mag geen pikaos zijn.", - "error_label_username_is_special_label": "De gebruikersnaam mag geen speciale tekens of spaties bevatten.", + "error_label_username_is_invalid_label": "De gebruikersnaam mag geen speciale tekens of spaties bevatten.", "error_label_hostname_is_special_label": "Hostnaam mag geen speciale tekens of spaties bevatten.", "error_label_password_mismatch_label": "Wachtwoorden komen niet overeen!", "first_setup_gameutils_box_text_title": "PikaOS Gaming metapakket", diff --git a/locales/sv_SE.json b/locales/sv_SE.json index abf41a6..b5d4637 100644 --- a/locales/sv_SE.json +++ b/locales/sv_SE.json @@ -32,7 +32,7 @@ "user_info_password_verify_title": "Ange Användarlösenord igen:", "error_label_is_root_label": "Användarnamn kan inte vara root.", "error_label_is_pikaos_label": "Användarnamn kan inte vara pikaos.", - "error_label_username_is_special_label": "Användarnamnet får inte innehålla specialtecken eller mellanslag.", + "error_label_username_is_invalid_label": "Användarnamnet får inte innehålla specialtecken eller mellanslag.", "error_label_hostname_is_special_label": "Hostname får inte innehålla specialtecken eller mellanslag.", "error_label_password_mismatch_label": "Lösenorden matchar inte varandra!", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta Package", diff --git a/locales/tr_TR.json b/locales/tr_TR.json index 51ea017..c970521 100644 --- a/locales/tr_TR.json +++ b/locales/tr_TR.json @@ -33,7 +33,7 @@ "user_info_password_verify_title": "Kullanıcı şifresini tekrar girin:", "error_label_is_root_label": "Kullanıcı adı root olamaz.", "error_label_is_pikaos_label": "Kullanıcı adı pikaos olamaz.", - "error_label_username_is_special_label": "Kullanıcı adı boşlut yahut özel karakter içeremez.", + "error_label_username_is_invalid_label": "Kullanıcı adı boşlut yahut özel karakter içeremez.", "error_label_hostname_is_special_label": "Makine adı boşluk yahut özel karakter içeremez.", "error_label_password_mismatch_label": "Şifreler eşleşmiyor!", "first_setup_gameutils_box_text_title": "PikaOS Oyun Meta Paketi", diff --git a/src/first_setup/codec_carousel/mod.rs b/src/first_setup/codec_carousel/mod.rs index 8375626..5867734 100644 --- a/src/first_setup/codec_carousel/mod.rs +++ b/src/first_setup/codec_carousel/mod.rs @@ -83,7 +83,6 @@ pub fn codec_carousel( .title(t!("first_setup_codec_box_text_title")) .description(t!("first_setup_codec_box_text_description")) .build(); - first_setup_codec_box_text.add_css_class("compact"); let first_setup_codec_button = gtk::Button::builder() .label(t!("first_setup_codec_button_label")) diff --git a/src/first_setup/driver_carousel/mod.rs b/src/first_setup/driver_carousel/mod.rs index c515ca5..d541a95 100644 --- a/src/first_setup/driver_carousel/mod.rs +++ b/src/first_setup/driver_carousel/mod.rs @@ -45,7 +45,6 @@ pub fn driver_carousel( .title(t!("first_setup_driver_box_text_title")) .description(t!("first_setup_driver_box_text_description")) .build(); - first_setup_driver_box_text.add_css_class("compact"); let first_setup_driver_button = gtk::Button::builder() .label(t!("first_setup_driver_button_label")) diff --git a/src/first_setup/final_carousel/mod.rs b/src/first_setup/final_carousel/mod.rs index 40b9064..e7c5d91 100644 --- a/src/first_setup/final_carousel/mod.rs +++ b/src/first_setup/final_carousel/mod.rs @@ -30,7 +30,6 @@ pub fn final_carousel(first_setup_carousel: &adw::Carousel) { .title(t!("first_setup_final_box_text_title")) .description(t!("first_setup_final_box_text_description")) .build(); - first_setup_final_box_text.add_css_class("compact"); let first_setup_start_button = gtk::Button::builder() .label(t!("first_setup_reboot_button_label")) diff --git a/src/first_setup/gameutils_carousel/mod.rs b/src/first_setup/gameutils_carousel/mod.rs index e153af5..09427bc 100644 --- a/src/first_setup/gameutils_carousel/mod.rs +++ b/src/first_setup/gameutils_carousel/mod.rs @@ -83,7 +83,6 @@ pub fn gameutils_carousel( .title(t!("first_setup_gameutils_box_text_title")) .description(t!("first_setup_gameutils_box_text_description")) .build(); - first_setup_gameutils_box_text.add_css_class("compact"); let first_setup_gameutils_button = gtk::Button::builder() .label(t!("first_setup_gameutils_button_label")) diff --git a/src/first_setup/initial_carousel/mod.rs b/src/first_setup/initial_carousel/mod.rs index 44f7cdd..815da0e 100644 --- a/src/first_setup/initial_carousel/mod.rs +++ b/src/first_setup/initial_carousel/mod.rs @@ -24,7 +24,6 @@ pub fn initial_carousel(first_setup_carousel: &adw::Carousel) { .title(t!("first_setup_initial_box_text_title")) .description(t!("first_setup_initial_box_text_description")) .build(); - first_setup_initial_box_text.add_css_class("compact"); let first_setup_start_button = gtk::Button::builder() .label(t!("first_setup_start_button_label")) diff --git a/src/first_setup/internet_carousel/mod.rs b/src/first_setup/internet_carousel/mod.rs index 6c0e1be..0a6a1aa 100644 --- a/src/first_setup/internet_carousel/mod.rs +++ b/src/first_setup/internet_carousel/mod.rs @@ -65,10 +65,9 @@ pub fn internet_carousel( .title(t!("first_setup_internet_box_text_title")) .description(t!("first_setup_internet_box_text_description")) .hexpand(true) - .vexpand(true) - .valign(Align::Start) + .vexpand(true) .build(); - first_setup_internet_box_text.add_css_class("compact"); + let internet_skip_button = gtk::Button::builder() .label(t!("internet_skip_button_label")) diff --git a/src/first_setup/update_carousel/mod.rs b/src/first_setup/update_carousel/mod.rs index ed419e1..b2a7cc3 100644 --- a/src/first_setup/update_carousel/mod.rs +++ b/src/first_setup/update_carousel/mod.rs @@ -83,7 +83,7 @@ pub fn update_carousel( .title(t!("first_setup_update_box_text_title")) .description("We recommend updating your PikaOS install before proceeding\nWould you like to Update your system?") .build(); - first_setup_update_box_text.add_css_class("compact"); + let first_setup_update_button = gtk::Button::builder() .label(t!("first_setup_update_button_label")) diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index 20a763e..7f22fac 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -31,10 +31,6 @@ hostnamectl set-hostname "${HOSTNAME}" echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts "###; -fn only_alphanumeric(input: &str) -> bool { - return input.chars().all(|c| c.is_alphanumeric()); -} - fn uppercase_first_letter(s: &str) -> String { let mut c = s.chars(); match c.next() { @@ -70,13 +66,35 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { .margin_top(15) .build(); - let first_setup_user_box_text = adw::StatusPage::builder() + let first_user_text0 = gtk::Label::builder() + .margin_end(15) + .margin_start(15) + .margin_bottom(5) + .margin_top(15) + .label(t!("first_setup_user_box_text_title")) + .halign(Align::Center) + .build(); + first_user_text0.add_css_class("title-1"); + + let first_user_text1 = gtk::Label::builder() + .margin_end(15) + .margin_start(15) + .margin_bottom(15) + .margin_top(5) + .label(t!("first_setup_user_box_text_description")) + .halign(Align::Center) + .build(); + + /*let first_setup_user_box_text = adw::StatusPage::builder() .title(t!("first_setup_user_box_text_title")) .description(t!("first_setup_user_box_text_description")) - .hexpand(true) - .valign(Align::Start) - .build(); - first_setup_user_box_text.add_css_class("compact"); + .vexpand(true) + .hexpand(true) + .build();*/ + + let first_setup_user_box_text = gtk::Box::new(Orientation::Vertical, 0); + first_setup_user_box_text.append(&first_user_text0); + first_setup_user_box_text.append(&first_user_text1); let user_info_box = gtk::Box::builder() .orientation(Orientation::Vertical) @@ -146,15 +164,50 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { .build(); user_info_listbox.add_css_class("boxed-list"); - let error_label = gtk::Label::builder() - .margin_top(15) - .margin_bottom(15) - .margin_start(15) - .margin_end(15) + let error_label_is_root = gtk::Label::builder() + .margin_top(2) + .margin_end(2) + .label(t!("error_label_is_root_label")) + .visible(false) + .build(); + + error_label_is_root.add_css_class("red-text"); + + let error_label_is_pikaos = gtk::Label::builder() + .margin_top(2) + .margin_end(2) + .label(t!("error_label_is_pikaos_label")) + .visible(false) + .build(); + + error_label_is_pikaos.add_css_class("red-text"); + + let error_label_username_is_invalid = gtk::Label::builder() + .margin_top(2) + .margin_end(2) + .label(t!("error_label_username_is_invalid_label")) .visible(false) .build(); - error_label.add_css_class("red-text"); + error_label_username_is_invalid.add_css_class("red-text"); + + let error_label_hostname_is_special = gtk::Label::builder() + .margin_top(2) + .margin_end(2) + .label(t!("error_label_hostname_is_special_label")) + .visible(false) + .build(); + + error_label_hostname_is_special.add_css_class("red-text"); + + let error_label_password_mismatch = gtk::Label::builder() + .margin_top(2) + .margin_end(2) + .label(t!("error_label_password_mismatch_label")) + .visible(false) + .build(); + + error_label_password_mismatch.add_css_class("red-text"); let user_next_button = gtk::Button::builder() .label(t!("internet_next_button_label")) @@ -181,7 +234,11 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { first_setup_user_box.append(&first_setup_user_box_text); first_setup_user_box.append(&user_info_box_clamp); - first_setup_user_box.append(&error_label); + first_setup_user_box.append(&error_label_is_root); + first_setup_user_box.append(&error_label_is_pikaos); + first_setup_user_box.append(&error_label_username_is_invalid); + first_setup_user_box.append(&error_label_hostname_is_special); + first_setup_user_box.append(&error_label_password_mismatch); first_setup_user_box.append(&user_next_button); // The main loop executes the asynchronous block @@ -196,7 +253,7 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { } })); - user_info_username.connect_changed(clone!(@strong user_info_username_valid, @weak user_info_username, @weak user_info_full_name, @weak error_label => move |_| { + user_info_username.connect_changed(clone!(@strong user_info_username_valid, @weak user_info_username, @weak user_info_full_name, @weak error_label_username_is_invalid, @weak error_label_is_pikaos, @weak error_label_is_root => move |_| { let user_info_username_string = user_info_username.text().to_string(); user_info_full_name.set_text(&uppercase_first_letter(&user_info_username_string)); @@ -206,48 +263,44 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { user_info_username.set_position(-1); } - if Regex::new(r"[A-Z]").unwrap().is_match(&user_info_username_string) { - user_info_username.set_text(&user_info_username_string.to_lowercase()); - user_info_username.set_position(-1); - } - let mut _username_is_root = false; let mut _username_is_pikaos = false; - let mut _username_is_special = false; + let mut _user_name_is_invalid = false; if user_info_username_string != "root" { + error_label_is_root.set_visible(false); _username_is_root=false; } else { - error_label.set_label(&t!("error_label_is_root_label")); + error_label_is_root.set_visible(true); _username_is_root=true; } if user_info_username_string != "pikaos" { + error_label_is_pikaos.set_visible(false); _username_is_pikaos=false; } else { - error_label.set_label(&t!("error_label_is_pikaos_label")); + error_label_is_pikaos.set_visible(true); _username_is_pikaos=true; } - if only_alphanumeric(&user_info_username_string) { - _username_is_special=false; + if Regex::new(r"^[a-z_][-a-z0-9_]*\$?$").unwrap().is_match(&user_info_username_string) || user_info_username_string.is_empty() { + error_label_username_is_invalid.set_visible(false); + _user_name_is_invalid=false; } else { - error_label.set_label(&t!("error_label_username_is_special_label")); - _username_is_special=true; + error_label_username_is_invalid.set_visible(true); + _user_name_is_invalid=true; } - if _username_is_root == false && _username_is_pikaos == false && _username_is_special == false { - error_label.set_visible(false); + if _username_is_root == false && _username_is_pikaos == false && _user_name_is_invalid == false { if !user_info_username.text().is_empty() { *user_info_username_valid.borrow_mut()=true; } } else { *user_info_username_valid.borrow_mut()=false; - error_label.set_visible(true); } })); - user_info_full_name.connect_changed(clone!(@strong user_info_full_name_valid, @weak user_info_full_name, @weak error_label => move |_| { + user_info_full_name.connect_changed(clone!(@strong user_info_full_name_valid, @weak user_info_full_name => move |_| { let user_info_full_name_string = user_info_full_name.text().to_string(); if user_info_full_name_string.len() > 32 { @@ -262,7 +315,7 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { } })); - user_info_hostname.connect_changed(clone!(@strong user_info_hostname_valid, @weak user_info_hostname, @weak user_info_full_name, @weak error_label => move |_| { + user_info_hostname.connect_changed(clone!(@strong user_info_hostname_valid, @weak user_info_hostname, @weak user_info_full_name, @weak error_label_hostname_is_special => move |_| { let user_info_hostname_string = user_info_hostname.text().to_string(); if user_info_hostname_string.len() > 32 { @@ -273,24 +326,23 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { let mut _hostname_is_special = false; if Regex::new(r"^[A-Za-z0-9\.]*$").unwrap().is_match(&user_info_hostname_string) { + error_label_hostname_is_special.set_visible(false); _hostname_is_special=false; } else { - error_label.set_label(&t!("error_label_hostname_is_special_label")); + error_label_hostname_is_special.set_visible(true); _hostname_is_special=true; } if _hostname_is_special == false { - error_label.set_visible(false); if !user_info_hostname.text().is_empty() { *user_info_hostname_valid.borrow_mut()=true; } } else { *user_info_hostname_valid.borrow_mut()=false; - error_label.set_visible(true); } })); - user_info_password.connect_changed(clone!(@strong user_info_passwords_valid,@weak user_info_password_verify_revealer, @weak user_info_password, @weak user_info_password_verify, @weak error_label => move |_| { + user_info_password.connect_changed(clone!(@strong user_info_passwords_valid,@weak user_info_password_verify_revealer, @weak user_info_password, @weak user_info_password_verify, @weak error_label_password_mismatch => move |_| { if user_info_password.text().is_empty() { user_info_password_verify_revealer.set_reveal_child(false) } else { @@ -298,20 +350,20 @@ pub fn user_carousel(first_setup_carousel: &adw::Carousel) { } if user_info_password.text() == user_info_password_verify.text() { - error_label.set_visible(false); + error_label_password_mismatch.set_visible(false); *user_info_passwords_valid.borrow_mut()=true; } else { + error_label_password_mismatch.set_visible(true); *user_info_passwords_valid.borrow_mut()=false; } })); - user_info_password_verify.connect_changed(clone!(@strong user_info_passwords_valid, @weak user_info_password, @weak user_info_password_verify, @weak error_label => move |_| { + user_info_password_verify.connect_changed(clone!(@strong user_info_passwords_valid, @weak user_info_password, @weak user_info_password_verify, @weak error_label_password_mismatch => move |_| { if user_info_password.text() == user_info_password_verify.text() { - error_label.set_visible(false); + error_label_password_mismatch.set_visible(false); *user_info_passwords_valid.borrow_mut()=true; } else { - error_label.set_visible(true); - error_label.set_label(&t!("error_label_password_mismatch_label")); + error_label_password_mismatch.set_visible(true); *user_info_passwords_valid.borrow_mut()=false; } })); From 7f843c1b2eb140afa1db5cf6212a25eed9c1f7c1 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 12 Oct 2024 00:37:47 +0300 Subject: [PATCH 04/67] Remove all extra steps --- .github/release-nest-v3 | 2 +- debian/changelog | 2 +- locales/bg_BG.json | 2 +- locales/cs_CZ.json | 2 +- locales/de_DE.json | 2 +- locales/en_US.json | 2 +- locales/fr_FR.json | 2 +- locales/it_IT.json | 2 +- locales/nl_NL.json | 2 +- locales/sv_SE.json | 2 +- locales/tr_TR.json | 2 +- src/first_setup/mod.rs | 12 ++++++------ 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..e440e5c 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index b5577b0..2ae2f56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.1-101pika2) pika; urgency=low +pika-first-setup (1.0.1-101pika3) pika; urgency=low * Just rebuild for OS4 diff --git a/locales/bg_BG.json b/locales/bg_BG.json index 5081b07..c5934ca 100644 --- a/locales/bg_BG.json +++ b/locales/bg_BG.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Пропусни Мрежова Настройка?", "first_setup_internet_skip_dialog_body": "Пропускайки Мрежовата Настройка, много от следващите стъпки ще са недостъпни!\nТова НЕ Е препоръчително.", "first_setup_internet_skip_dialog_skip_cancel_label": "Обратно към Мрежови Настройки", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Просто Пропусни!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Просто Пропусни!", "first_setup_internet_box_text_description_true": "Устройството се свърза с Интернет успешно!", "first_setup_internet_box_text_description_false": "Няма връзка с Интернет!", "first_setup_update_box_text_title": "Системни Актуализации", diff --git a/locales/cs_CZ.json b/locales/cs_CZ.json index c7eb150..a5ced7e 100644 --- a/locales/cs_CZ.json +++ b/locales/cs_CZ.json @@ -12,7 +12,7 @@ "first_setup_internet_skip_dialog_heading": "Přeskočit nastavení sítě?", "first_setup_internet_skip_dialog_body": "Pokud-li přeskočíš nastavení sítě, mnoho dalších kroku nebude možné provést! Tento krok NEDOPORUČUJEME přeskakovat.", "first_setup_internet_skip_dialog_skip_cancel_label": "Zpátky na nastavení sítě", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Chci přeskočit!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Chci přeskočit!", "first_setup_internet_box_text_description_true": "Zařízení se připojilo k internetu úspěšně!", "first_setup_internet_box_text_description_false": "Žádné připojení k internetu!", "first_setup_update_box_text_title": "Aktualizace systému", diff --git a/locales/de_DE.json b/locales/de_DE.json index fccfb1f..4397652 100644 --- a/locales/de_DE.json +++ b/locales/de_DE.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Netzwerkeinrichtung überspringen?", "first_setup_internet_skip_dialog_body": "Wenn du die Netzwerkeinrichtung überspringst, sind viele der nächsten Schritte nicht verfügbar!\nDies wird NICHT empfohlen.", "first_setup_internet_skip_dialog_skip_cancel_label": "Zurück zur Netzwerkeinrichtung", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Ja überspringen!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Ja überspringen!", "first_setup_internet_box_text_description_true": "Gerät hat sich erfolgfreich mit dem Internet verbunden!", "first_setup_internet_box_text_description_false": "Keine Internetverbindung!", "first_setup_update_box_text_title": "System Aktualisierungen", diff --git a/locales/en_US.json b/locales/en_US.json index 9b07022..4873f42 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Skip Network Setup?", "first_setup_internet_skip_dialog_body": "Skipping Network Setup will make many of the next steps unavailable!\nThis is NOT recommended.", "first_setup_internet_skip_dialog_skip_cancel_label": "Return to Network Setup", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Just Skip!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Just Skip!", "first_setup_internet_box_text_description_true": "Device connected to Internet Successfully!", "first_setup_internet_box_text_description_false": "No internet Connection!", "first_setup_update_box_text_title": "System Updates", diff --git a/locales/fr_FR.json b/locales/fr_FR.json index 8564eb4..8f22c53 100644 --- a/locales/fr_FR.json +++ b/locales/fr_FR.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Passer la configuration du réseau ?", "first_setup_internet_skip_dialog_body": "Si vous sautez l'étape de l'installation du réseau, la plupart des étapes suivantes ne seront pas disponibles !\nCeci n'est PAS recommandé", "first_setup_internet_skip_dialog_skip_cancel_label": "Retour à la configuration du réseau", - "first-setup-internet-skip-dialog-skip-confirm-labe": "", + "first_setup_internet_skip_dialog_skip_confirm_label": "", "first_setup_internet_box_text_description_true": "L'appareil s'est connecté à Internet avec succès !", "first_setup_internet_box_text_description_false": "Pas de connexion internet !", "first_setup_update_box_text_title": "Mises à jour du système", diff --git a/locales/it_IT.json b/locales/it_IT.json index 6f298b3..1d28284 100644 --- a/locales/it_IT.json +++ b/locales/it_IT.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Vuoi saltare la configurazione di Internet?", "first_setup_internet_skip_dialog_body": "Saltare la configurazione della rete renderà molti dei prossimi passaggi impossibili!\\nQuesto non è raccomandato.", "first_setup_internet_skip_dialog_skip_cancel_label": "Ritorna alla configurazione della rete", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Si voglio saltarla!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Si voglio saltarla!", "first_setup_internet_box_text_description_true": "Il dispositivo è stato connesso a Internet con successo!", "first_setup_internet_box_text_description_false": "Non c'è alcuna connessione a Internet!", "first_setup_update_box_text_title": "Aggiornamenti di sistema", diff --git a/locales/nl_NL.json b/locales/nl_NL.json index b291b52..3342f23 100644 --- a/locales/nl_NL.json +++ b/locales/nl_NL.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Netwerkconfiguratie overslaan?", "first_setup_internet_skip_dialog_body": "Als u Netwerkinstellingen overslaat, zijn veel van de volgende stappen niet beschikbaar!\nDit wordt NIET aanbevolen.", "first_setup_internet_skip_dialog_skip_cancel_label": "Terug naar netwerkinstellingen", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Gewoon overslaan!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Gewoon overslaan!", "first_setup_internet_box_text_description_true": "Apparaat is succesvol verbonden met internet!", "first_setup_internet_box_text_description_false": "Geen internetverbinding!", "first_setup_update_box_text_title": "Systeemupdates", diff --git a/locales/sv_SE.json b/locales/sv_SE.json index b5d4637..cf3072b 100644 --- a/locales/sv_SE.json +++ b/locales/sv_SE.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Hoppa över Nätverkskonfiguration?", "first_setup_internet_skip_dialog_body": "Om du hoppar över Nätverkskonfiguration blir många av de följande stegen otillgängliga!\nDetta rekommenderas INTE.", "first_setup_internet_skip_dialog_skip_cancel_label": "Återgå till Nätverkskonfiguration", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Hoppa över!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Hoppa över!", "first_setup_internet_box_text_description_true": "Enheten har anslutits till Internet!", "first_setup_internet_box_text_description_false": "Ingen internetanslutning!", "first_setup_update_box_text_title": "Systemuppdateringar", diff --git a/locales/tr_TR.json b/locales/tr_TR.json index c970521..fcfacbe 100644 --- a/locales/tr_TR.json +++ b/locales/tr_TR.json @@ -13,7 +13,7 @@ "first_setup_internet_skip_dialog_heading": "Ağ Kurulumunu atla?", "first_setup_internet_skip_dialog_body": "Ağ Bağlantısı Kurulumunu atlamak sonraki birçok adımı erişilemez yapacaktır!\nBu tavsiye EDİLMEZ.", "first_setup_internet_skip_dialog_skip_cancel_label": "Ağ Bağlantısı Kurulumuna Geri Dön", - "first-setup-internet-skip-dialog-skip-confirm-labe": "Sadece Atla!", + "first_setup_internet_skip_dialog_skip_confirm_label": "Sadece Atla!", "first_setup_internet_box_text_description_true": "Cihaz İnternete başarıyla bağlandı!", "first_setup_internet_box_text_description_false": "İnternet Bağlantısı yok!", "first_setup_update_box_text_title": "Sistem Güncellemeleri", diff --git a/src/first_setup/mod.rs b/src/first_setup/mod.rs index 1925732..485406e 100644 --- a/src/first_setup/mod.rs +++ b/src/first_setup/mod.rs @@ -15,19 +15,19 @@ use std::rc::Rc; mod initial_carousel; mod internet_carousel; mod user_carousel; -mod update_carousel; +/*mod update_carousel; mod driver_carousel; mod codec_carousel; -mod gameutils_carousel; +mod gameutils_carousel;*/ mod final_carousel; use initial_carousel::*; use internet_carousel::*; use user_carousel::*; -use update_carousel::*; +/*use update_carousel::*; use driver_carousel::*; use codec_carousel::*; -use gameutils_carousel::*; +use gameutils_carousel::*;*/ use final_carousel::*; pub fn first_setup(window: &adw::ApplicationWindow) { @@ -72,10 +72,10 @@ pub fn first_setup(window: &adw::ApplicationWindow) { initial_carousel(&first_setup_carousel); internet_carousel(&first_setup_carousel, &internet_connected, &window); user_carousel(&first_setup_carousel); - update_carousel(&first_setup_carousel, &internet_connected, &window); + /*update_carousel(&first_setup_carousel, &internet_connected, &window); driver_carousel(&first_setup_carousel, &internet_connected); codec_carousel(&first_setup_carousel, &internet_connected, &window); - gameutils_carousel(&first_setup_carousel, &internet_connected, &window); + gameutils_carousel(&first_setup_carousel, &internet_connected, &window);*/ final_carousel(&first_setup_carousel); // Add file to window From d9816043209ae9b97b1c5a4617dfb507796a177a Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 09:53:47 +0100 Subject: [PATCH 05/67] host should be on 127.0.1.1 not 127.0.0.1 --- src/first_setup/user_carousel/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index 7f22fac..291b263 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -28,7 +28,7 @@ chown -R "${USERNAME}":"${USERNAME}" /home/"${USERNAME}" usermod -a -G adm,cdrom,sudo,render,dip,video,plugdev,input,render,lpadmin "${USERNAME}" rm -rf /etc/sddm.conf.d/zautologin.conf || true hostnamectl set-hostname "${HOSTNAME}" -echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts +echo "127.0.1.1 ${HOSTNAME}" >> /etc/hosts "###; fn uppercase_first_letter(s: &str) -> String { From f61e7af4a6955d353b118993bbedad2fe42823e5 Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 09:54:09 +0100 Subject: [PATCH 06/67] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ae2f56..ac09c4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-first-setup (1.0.2-101pika3) pika; urgency=low + + * Update host ip + + -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 + pika-first-setup (1.0.1-101pika3) pika; urgency=low * Just rebuild for OS4 From 9fbebcad274505e1e5427ced8c50a54a32552dad Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 09:54:19 +0100 Subject: [PATCH 07/67] Update main.sh --- main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.sh b/main.sh index 47d1f54..10ab6fb 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="1.0.1" +VERSION="1.0.2" source ./pika-build-config.sh From 9a0ac9b3b9a3edc45e538bb82d7e3a7a2446caae Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 09:54:27 +0100 Subject: [PATCH 08/67] Update .github/release-nest-v3 --- .github/release-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index e440e5c..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -3 \ No newline at end of file +1 \ No newline at end of file From a0beb0b591004bd2d3f7298072a1aef7c463c13d Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:07:29 +0100 Subject: [PATCH 09/67] Update src/first_setup/user_carousel/mod.rs --- src/first_setup/user_carousel/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index 291b263..a192406 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -28,7 +28,7 @@ chown -R "${USERNAME}":"${USERNAME}" /home/"${USERNAME}" usermod -a -G adm,cdrom,sudo,render,dip,video,plugdev,input,render,lpadmin "${USERNAME}" rm -rf /etc/sddm.conf.d/zautologin.conf || true hostnamectl set-hostname "${HOSTNAME}" -echo "127.0.1.1 ${HOSTNAME}" >> /etc/hosts +echo "\n127.0.1.1 ${HOSTNAME}" >> /etc/hosts "###; fn uppercase_first_letter(s: &str) -> String { From 8fed018f538528b732cbb7487fedddbaed3038ce Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:07:51 +0100 Subject: [PATCH 10/67] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac09c4b..7984468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-first-setup (1.0.2-101pika4) pika; urgency=low + + * Update host ip + + -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 + pika-first-setup (1.0.2-101pika3) pika; urgency=low * Update host ip From 0b6cbee8954d4442fa0f9e5793f177e30fe19a3b Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:07:58 +0100 Subject: [PATCH 11/67] Update .github/release-nest-v3 --- .github/release-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file From 730f332ef4a598a1e84054756869bc6788083ac2 Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:09:50 +0100 Subject: [PATCH 12/67] Update src/first_setup/user_carousel/mod.rs --- src/first_setup/user_carousel/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index a192406..cb146b3 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -28,7 +28,8 @@ chown -R "${USERNAME}":"${USERNAME}" /home/"${USERNAME}" usermod -a -G adm,cdrom,sudo,render,dip,video,plugdev,input,render,lpadmin "${USERNAME}" rm -rf /etc/sddm.conf.d/zautologin.conf || true hostnamectl set-hostname "${HOSTNAME}" -echo "\n127.0.1.1 ${HOSTNAME}" >> /etc/hosts +echo "" >> /etc/hosts +echo "127.0.1.1 ${HOSTNAME}" >> /etc/hosts "###; fn uppercase_first_letter(s: &str) -> String { From 704233353432bec2e2a0831ec80eca4178207f20 Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:10:10 +0100 Subject: [PATCH 13/67] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7984468..de19753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-first-setup (1.0.2-101pika5) pika; urgency=low + + * Update host ip + + -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 + pika-first-setup (1.0.2-101pika4) pika; urgency=low * Update host ip From 7d29d16787e2072ca10c07019d0841388b659788 Mon Sep 17 00:00:00 2001 From: ferreo Date: Tue, 5 Nov 2024 10:13:06 +0100 Subject: [PATCH 14/67] Update .github/release-nest-v3 --- .github/release-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file From bc1528cacf2d6fc70fe1b906d9363566f6b27ab8 Mon Sep 17 00:00:00 2001 From: ferreo Date: Fri, 15 Nov 2024 17:38:43 +0100 Subject: [PATCH 15/67] Update pika-build-config/amd64-v3.sh --- pika-build-config/amd64-v3.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh index 10285b4..cd674a1 100755 --- a/pika-build-config/amd64-v3.sh +++ b/pika-build-config/amd64-v3.sh @@ -1,10 +1,10 @@ #! /bin/bash export PIKA_BUILD_ARCH="amd64-v3" export DEBIAN_FRONTEND="noninteractive" -export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto=auto" +export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto" +export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto" +export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto" +export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto" export DEB_BUILD_OPTIONS="nocheck notest terse" export DPKG_GENSYMBOLS_CHECK_LEVEL=0 From dc063fda7c752eb87ceacddf5a996d57d2922f84 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 27 Nov 2024 20:45:44 +0300 Subject: [PATCH 16/67] make sure created user id is 1000 and fix network --- .github/release-nest-v3 | 2 +- debian/changelog | 20 +------------------- debian/control | 2 +- src/first_setup/internet_carousel/mod.rs | 16 +++++++++------- src/first_setup/user_carousel/mod.rs | 2 +- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..7813681 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +5 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index de19753..12090bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,4 @@ -pika-first-setup (1.0.2-101pika5) pika; urgency=low - - * Update host ip - - -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 - -pika-first-setup (1.0.2-101pika4) pika; urgency=low - - * Update host ip - - -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 - -pika-first-setup (1.0.2-101pika3) pika; urgency=low - - * Update host ip - - -- Ward Nakchbandi Thu, 20 Sep 2022 22:01:00 +0000 - -pika-first-setup (1.0.1-101pika3) pika; urgency=low +pika-first-setup (1.0.1-101pika4) pika; urgency=low * Just rebuild for OS4 diff --git a/debian/control b/debian/control index aa97a26..d3da2a6 100644 --- a/debian/control +++ b/debian/control @@ -14,5 +14,5 @@ Rules-Requires-Root: no Package: pika-first-setup-gtk4 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, nm-connection-editor Description: A frontend in GTK 4 and Libadwaita for initial user setup in pika. diff --git a/src/first_setup/internet_carousel/mod.rs b/src/first_setup/internet_carousel/mod.rs index 0a6a1aa..a244ce3 100644 --- a/src/first_setup/internet_carousel/mod.rs +++ b/src/first_setup/internet_carousel/mod.rs @@ -166,16 +166,18 @@ pub fn internet_carousel( })); first_setup_internet_button.connect_clicked(move |_| { - let env_xdg_session_desktop = env::var("XDG_SESSION_DESKTOP").unwrap(); + let env_xdg_session_desktop = env::var("XDG_SESSION_DESKTOP").unwrap().to_lowercase(); if env_xdg_session_desktop.contains("gnome") || env_xdg_session_desktop.contains("ubuntu") { - Command::new("gnome-control-center") + let _ = Command::new("gnome-control-center") .arg("network") - .spawn() - .expect("gnome-control-center failed to start"); + .spawn(); + } else if env_xdg_session_desktop.contains("plasma") || env_xdg_session_desktop.contains("kde") { + let _ = Command::new("systemsettings") + .arg("kcm_networkmanagement") + .spawn(); } else { - Command::new("nm-connection-editor") - .spawn() - .expect("nm-connection-editor failed to start"); + let _ = Command::new("nm-connection-editor") + .spawn(); } }); diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index cb146b3..534f0d8 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -19,7 +19,7 @@ USERNAME="$0" PASSWORD="$1" FULLNAME="$2" HOSTNAME="$3" -adduser --quiet --disabled-password --shell /bin/bash --gecos "${FULLNAME}" "${USERNAME}" +adduser --uid 1000 --gid 1000 --quiet --disabled-password --shell /bin/bash --gecos "${FULLNAME}" "${USERNAME}" echo "${USERNAME}":"${PASSWORD}" | chpasswd usermod -a -G sudo "${USERNAME}" mkdir -p /home/"${USERNAME}" From 10e265ad217c05ab046f1bde6026fae184314954 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 27 Nov 2024 20:49:41 +0300 Subject: [PATCH 17/67] --- .github/release-nest-v3 | 2 +- Cargo.toml | 2 +- debian/changelog | 2 +- main.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 7813681..62f9457 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -5 \ No newline at end of file +6 \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 1fe57d4..bc37d28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pika-first-setup-gtk4" -version = "1.0.1" +version = "1.0.4" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/debian/changelog b/debian/changelog index 12090bc..c7379d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.1-101pika4) pika; urgency=low +pika-first-setup (1.0.4-101pika1) pika; urgency=low * Just rebuild for OS4 diff --git a/main.sh b/main.sh index 10ab6fb..1deb0b7 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="1.0.2" +VERSION="1.0.4" source ./pika-build-config.sh From 10d6516a8dcce8512768a6491aae816ec11d9c17 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 27 Nov 2024 20:49:50 +0300 Subject: [PATCH 18/67] g --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 51b4af7..a66b888 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -816,7 +816,7 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "pika-first-setup-gtk4" -version = "1.0.1" +version = "1.0.4" dependencies = [ "async-channel", "duct", From a6a4ed12c58adb2653b0ea6b4ad0df773c13d826 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Wed, 27 Nov 2024 21:23:06 +0100 Subject: [PATCH 19/67] Update src/first_setup/user_carousel/mod.rs --- src/first_setup/user_carousel/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/first_setup/user_carousel/mod.rs b/src/first_setup/user_carousel/mod.rs index 534f0d8..8c6f84a 100644 --- a/src/first_setup/user_carousel/mod.rs +++ b/src/first_setup/user_carousel/mod.rs @@ -19,6 +19,7 @@ USERNAME="$0" PASSWORD="$1" FULLNAME="$2" HOSTNAME="$3" +groupadd -g 1000 "${USERNAME}" adduser --uid 1000 --gid 1000 --quiet --disabled-password --shell /bin/bash --gecos "${FULLNAME}" "${USERNAME}" echo "${USERNAME}":"${PASSWORD}" | chpasswd usermod -a -G sudo "${USERNAME}" From 218cacc48dc63fd367ecb907b8475cd77e0f0d2c Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Wed, 27 Nov 2024 21:23:38 +0100 Subject: [PATCH 20/67] Update debian/changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c7379d7..03e2e52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.4-101pika1) pika; urgency=low +pika-first-setup (1.0.4-101pika2) pika; urgency=low * Just rebuild for OS4 From 037c401296083488dec6e07a3cd820a05c648933 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Wed, 27 Nov 2024 21:24:08 +0100 Subject: [PATCH 21/67] Update .github/release-nest-v3 --- .github/release-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 62f9457..c793025 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -6 \ No newline at end of file +7 \ No newline at end of file From 6b92b359a065b65c754c924d29e14ba7d9e5b6fc Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Fri, 29 Nov 2024 18:54:07 +0300 Subject: [PATCH 22/67] fix username message --- .github/release-nest-v3 | 2 +- debian/changelog | 2 +- locales/en_US.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index c793025..301160a 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 03e2e52..21931f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-first-setup (1.0.4-101pika2) pika; urgency=low +pika-first-setup (1.0.4-101pika3) pika; urgency=low * Just rebuild for OS4 diff --git a/locales/en_US.json b/locales/en_US.json index 4873f42..5232081 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -33,7 +33,7 @@ "user_info_password_verify_title": "Enter User password again:", "error_label_is_root_label": "Username can not be root.", "error_label_is_pikaos_label": "Username can not be pikaos.", - "error_label_username_is_invalid_label": "Username is invalid.", + "error_label_username_is_invalid_label": "Username is can only contain:\nlowercase letters\n \"-\" and \"_\"\n and must start with a lowercase letter.", "error_label_hostname_is_special_label": "Hostname can not contain special characters or spaces.", "error_label_password_mismatch_label": "Passwords do not match!", "first_setup_gameutils_box_text_title": "PikaOS Gaming Meta Package", From 80bb0e2dac96676f7f18481961ceacededebf53c Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Wed, 4 Dec 2024 15:09:56 +0100 Subject: [PATCH 23/67] Update .github/build-nest-v3 --- .github/build-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file From 9cd4bebc3ac3ca18cfe0e77152f4dc803a440b3e Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Wed, 4 Dec 2024 17:36:03 +0100 Subject: [PATCH 24/67] Update .github/build-nest-v3 --- .github/build-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index d8263ee..e440e5c 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file From 5f3eeb9b04f8f0ed1ef0d0e85ff4efcc4e26c57c Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 19:49:35 +0300 Subject: [PATCH 25/67] idk --- .github/github_pushback.sh | 13 +++++++++++++ .github/workflows/github-pushback.yml | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 .github/github_pushback.sh create mode 100644 .github/workflows/github-pushback.yml diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh new file mode 100755 index 0000000..4c6518f --- /dev/null +++ b/.github/github_pushback.sh @@ -0,0 +1,13 @@ +#! /bin/bash + +echo "${PWD##*/}" | grep "gitea-pika-first-setup" || echo "No push back here" && exit 0 + +git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup + +# Commit changes to git +git config --global user.name 'Github Mirror Push Back - Ward' +git config --global user.email 'hotrod.master@hotmail.com' +git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup +git add . +git commit -am"Github Mirror Push Back" +git push diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml new file mode 100644 index 0000000..cb6f136 --- /dev/null +++ b/.github/workflows/github-pushback.yml @@ -0,0 +1,20 @@ +name: PikaOS Package Build & Release (amd64-v3) + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + + - name: Release Package + run: ./.github/github_pushback.sh From 8a6582119a08ebe5b96d271b4f315e96faaec38b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 19:51:32 +0300 Subject: [PATCH 26/67] idk --- .github/workflows/github-pushback.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index cb6f136..d6525b3 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -1,4 +1,4 @@ -name: PikaOS Package Build & Release (amd64-v3) +name: Github Push back to gitea on: push: @@ -16,5 +16,5 @@ jobs: steps: - - name: Release Package - run: ./.github/github_pushback.sh + - name: Run + run: ls From c5542fd6c5a20baec073b2e9fea9539c1331e6d4 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 19:53:11 +0300 Subject: [PATCH 27/67] idk --- .github/workflows/github-pushback.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index d6525b3..886300f 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -15,6 +15,7 @@ jobs: options: --privileged -it steps: + - uses: actions/checkout@v3 - name: Run - run: ls + run: ./.github/github_pushback.sh From 6a33ef9f27a41f87f05fd85ce6443682f1f6a28d Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 19:55:44 +0300 Subject: [PATCH 28/67] idk --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43dbcda..24d4033 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -### PikaOS initial user setup +## PikaOS initial user setup A Rust based GTK4 + Libadwaita App for handling initial user setup on PikaOS. From 00c9414dc47ee3aaa64efb1a894bccb5db42ec9d Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:00:38 +0300 Subject: [PATCH 29/67] idk --- .github/github_pushback.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 4c6518f..1971bbb 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -1,6 +1,11 @@ #! /bin/bash -echo "${PWD##*/}" | grep "gitea-pika-first-setup" || echo "No push back here" && exit 0 +if echo "${PWD##*/}" | grep "gitea-pika-first-setup" +then + echo "This is github attempt pushback" +else + echo "No push back here" && exit 0 +fi git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup From 86fd11cadb235c0375c83afc905e4d8f93c8dc4b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:04:56 +0300 Subject: [PATCH 30/67] idk --- .github/github_pushback.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 1971bbb..e58e591 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -7,12 +7,13 @@ else echo "No push back here" && exit 0 fi -git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup + # Commit changes to git git config --global user.name 'Github Mirror Push Back - Ward' git config --global user.email 'hotrod.master@hotmail.com' git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup +git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . git commit -am"Github Mirror Push Back" git push From 09cd924bc780200f919343ac43e33682b14c39b4 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:11:14 +0300 Subject: [PATCH 31/67] idk --- .github/build-nest-v3 | 2 +- .github/workflows/build-canaryv3.yml | 4 ++++ .github/workflows/build-nestv3.yml | 4 ++++ .github/workflows/github-pushback.yml | 8 ++++++++ .github/workflows/release-canaryv3.yml | 4 ++++ .github/workflows/release-nestv3.yml | 4 ++++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index e440e5c..b8626c4 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -3 \ No newline at end of file +4 diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index bff3d86..8c4f21d 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -17,6 +17,10 @@ jobs: options: --privileged -it steps: + + - name: Not github check + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + - uses: actions/checkout@v3 - name: Install SSH key diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 3c9c34d..53424ac 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -17,6 +17,10 @@ jobs: options: --privileged -it steps: + + - name: Not github check + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + - uses: actions/checkout@v3 - name: Install SSH key diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 886300f..0f10e69 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -17,5 +17,13 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + - name: Run run: ./.github/github_pushback.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 436c8ff..a0fc7e8 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -17,6 +17,10 @@ jobs: options: --privileged -it steps: + + - name: Not github check + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + - uses: actions/checkout@v3 - name: Install SSH key diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index ed42bb7..dbf7276 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -17,6 +17,10 @@ jobs: options: --privileged -it steps: + + - name: Not github check + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + - uses: actions/checkout@v3 - name: Install SSH key From 9b323fbee1d75b6c64b2690cdbe16d844a99e54e Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:12:18 +0300 Subject: [PATCH 32/67] idk --- .github/build-nest-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index b8626c4..7ed6ff8 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -4 +5 From e23fe3649cb7e42956ee3b7a6f8d14d16391862f Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:14:29 +0300 Subject: [PATCH 33/67] idk --- .github/build-nest-v3 | 2 +- .github/github_pushback.sh | 2 +- .github/workflows/build-canaryv3.yml | 2 +- .github/workflows/build-nestv3.yml | 2 +- .github/workflows/release-canaryv3.yml | 2 +- .github/workflows/release-nestv3.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 7ed6ff8..1e8b314 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -5 +6 diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index e58e591..1ebfd47 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -4,7 +4,7 @@ if echo "${PWD##*/}" | grep "gitea-pika-first-setup" then echo "This is github attempt pushback" else - echo "No push back here" && exit 0 + echo "No push back here" && exit 1 fi diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 8c4f21d..0f213ce 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 53424ac..9f640f1 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index a0fc7e8..9eba62f 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index dbf7276..04a77af 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 0 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - uses: actions/checkout@v3 From 003744b30dc741c0bdad199080924ad7762f6418 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:25:32 +0300 Subject: [PATCH 34/67] idk --- .github/build-nest-v3 | 2 +- .github/workflows/build-canaryv3.yml | 2 +- .github/workflows/build-nestv3.yml | 2 +- .github/workflows/release-canaryv3.yml | 2 +- .github/workflows/release-nestv3.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 1e8b314..7f8f011 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -6 +7 diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 0f213ce..7c84161 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 9f640f1..61d1c08 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 9eba62f..3531c73 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - uses: actions/checkout@v3 diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 04a77af..9e4a6df 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - uses: actions/checkout@v3 From 63f5ae0f89dc13c96c82e3aeb9de4c2c01947118 Mon Sep 17 00:00:00 2001 From: ferreo Date: Wed, 4 Dec 2024 18:26:45 +0100 Subject: [PATCH 35/67] Update .github/github_pushback.sh --- .github/github_pushback.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 1ebfd47..b763943 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -10,8 +10,8 @@ fi # Commit changes to git -git config --global user.name 'Github Mirror Push Back - Ward' -git config --global user.email 'hotrod.master@hotmail.com' +git config --global user.name 'ferreo' +git config --global user.email 'harderthanfire@gmail.com' git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . From 7a366540c4ffeb6ad374e8d68dc8c82263eb766f Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:33:42 +0300 Subject: [PATCH 36/67] idk --- .github/github_pushback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index b763943..c062414 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -7,7 +7,7 @@ else echo "No push back here" && exit 1 fi - +ssh -vT git@git.pika-os.com # Commit changes to git git config --global user.name 'ferreo' From 4edcf2c91e27e6691878a59bf46539601b3befd9 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:39:54 +0300 Subject: [PATCH 37/67] idk --- .github/workflows/github-pushback.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 0f10e69..1f06ef0 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -25,5 +25,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Export SSH KEY + run: echo "${{ secrets.SSH_KEY }}" > /root/.ssh/id_rsa + - name: Run run: ./.github/github_pushback.sh From 0676d7a3b5552bf22d8efe10aa2c6ff4a28e8c19 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:43:47 +0300 Subject: [PATCH 38/67] idk --- .github/workflows/github-pushback.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 1f06ef0..8d31b71 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -17,16 +17,14 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Export SSH KEY - run: echo "${{ secrets.SSH_KEY }}" > /root/.ssh/id_rsa + - name: Setup SSH Keys and known_hosts + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + run: | + mkdir -p ~/.ssh + ssh-keyscan pika-os.com >> ~/.ssh/known_hosts + ssh-agent -a $SSH_AUTH_SOCK > /dev/null + ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Run run: ./.github/github_pushback.sh From 63c9314f2d436d00b39eccf58eaa19d55313087a Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:45:54 +0300 Subject: [PATCH 39/67] idk --- .github/workflows/github-pushback.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 8d31b71..df6b797 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -17,14 +17,14 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup SSH Keys and known_hosts - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan pika-os.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" + - name: Setup SSH Keys and known_hosts + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + run: | + mkdir -p ~/.ssh + ssh-keyscan pika-os.com >> ~/.ssh/known_hosts + ssh-agent -a $SSH_AUTH_SOCK > /dev/null + ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Run run: ./.github/github_pushback.sh From 86b4843f148c578b0d9adedd6b1a708edd18737e Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:48:06 +0300 Subject: [PATCH 40/67] idk --- .github/workflows/github-pushback.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index df6b797..2cbafa2 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -20,11 +20,7 @@ jobs: - name: Setup SSH Keys and known_hosts env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan pika-os.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" + run: mkdir -p ~/.ssh && ssh-keyscan pika-os.com >> ~/.ssh/known_hosts && ssh-agent -a $SSH_AUTH_SOCK > /dev/null && ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Run run: ./.github/github_pushback.sh From 37f6b7ddb10d4ec96be799e594b5f5106bb8f426 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:51:52 +0300 Subject: [PATCH 41/67] idk --- .github/github_pushback.sh | 5 +++++ .github/workflows/github-pushback.yml | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index c062414..ab6d9b2 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -7,6 +7,11 @@ else echo "No push back here" && exit 1 fi +mkdir -p ~/.ssh +ssh-keyscan github.com >> ~/.ssh/known_hosts +ssh-agent -a $SSH_AUTH_SOCK > /dev/null +ssh-add - <<< "$1" + ssh -vT git@git.pika-os.com # Commit changes to git diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 2cbafa2..7b3de85 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -17,10 +17,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup SSH Keys and known_hosts + - name: Run env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: mkdir -p ~/.ssh && ssh-keyscan pika-os.com >> ~/.ssh/known_hosts && ssh-agent -a $SSH_AUTH_SOCK > /dev/null && ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - - - name: Run - run: ./.github/github_pushback.sh + run: ./.github/github_pushback.sh "${{ secrets.SSH_PRIVATE_KEY }}" From b64df7c9a9592cf38a7423f7baabdf9060390ca0 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 20:53:44 +0300 Subject: [PATCH 42/67] idk --- .github/github_pushback.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index ab6d9b2..f869c82 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -8,7 +8,8 @@ else fi mkdir -p ~/.ssh -ssh-keyscan github.com >> ~/.ssh/known_hosts +ssh-keyscan pika-os.com >> ~/.ssh/known_hosts +ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "$1" From 2209d77ac9bff6aefbeb6f59b847a943586c5c8b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:31:10 +0300 Subject: [PATCH 43/67] idk --- .github/workflows/github-pushback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 7b3de85..4cfc3d1 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -20,4 +20,4 @@ jobs: - name: Run env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: ./.github/github_pushback.sh "${{ secrets.SSH_PRIVATE_KEY }}" + run: ./.github/github_pushback.sh "${{ secrets.SSH_KEY }}" From 8f873659fbd1016c238772b90187f1ba36d93a83 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:34:42 +0300 Subject: [PATCH 44/67] idk --- .github/github_pushback.sh | 7 ------- .github/workflows/github-pushback.yml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index f869c82..3bd8d16 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -1,12 +1,5 @@ #! /bin/bash -if echo "${PWD##*/}" | grep "gitea-pika-first-setup" -then - echo "This is github attempt pushback" -else - echo "No push back here" && exit 1 -fi - mkdir -p ~/.ssh ssh-keyscan pika-os.com >> ~/.ssh/known_hosts ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 4cfc3d1..9f0d16f 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -15,8 +15,20 @@ jobs: options: --privileged -it steps: + + - name: Is github check + run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + - uses: actions/checkout@v3 + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + - name: Run env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock From 4243b7a9cf59b9eec1f069bdcaf3741111504cd4 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:36:20 +0300 Subject: [PATCH 45/67] idk --- .github/workflows/build-canaryv3.yml | 4 ++-- .github/workflows/build-nestv3.yml | 4 ++-- .github/workflows/github-pushback.yml | 4 ++-- .github/workflows/release-canaryv3.yml | 4 ++-- .github/workflows/release-nestv3.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 7c84161..0e3396d 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -18,11 +18,11 @@ jobs: steps: + - uses: actions/checkout@v3 + - name: Not github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - - uses: actions/checkout@v3 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 61d1c08..0483ecb 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -18,11 +18,11 @@ jobs: steps: + - uses: actions/checkout@v3 + - name: Not github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - - uses: actions/checkout@v3 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 9f0d16f..67f5435 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -16,11 +16,11 @@ jobs: steps: + - uses: actions/checkout@v3 + - name: Is github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - - uses: actions/checkout@v3 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 3531c73..af44cab 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -18,11 +18,11 @@ jobs: steps: + - uses: actions/checkout@v3 + - name: Not github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - - uses: actions/checkout@v3 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 9e4a6df..9945f1d 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -18,11 +18,11 @@ jobs: steps: + - uses: actions/checkout@v3 + - name: Not github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 - - uses: actions/checkout@v3 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: From 49186f9a791acd7af69cc80ae28779260ac5bedf Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:42:22 +0300 Subject: [PATCH 46/67] idk --- .github/github_pushback.sh | 10 +++++----- .github/workflows/github-pushback.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 3bd8d16..fcd840e 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -1,10 +1,10 @@ #! /bin/bash -mkdir -p ~/.ssh -ssh-keyscan pika-os.com >> ~/.ssh/known_hosts -ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts -ssh-agent -a $SSH_AUTH_SOCK > /dev/null -ssh-add - <<< "$1" +#mkdir -p ~/.ssh +#ssh-keyscan pika-os.com >> ~/.ssh/known_hosts +#ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts +#ssh-agent -a $SSH_AUTH_SOCK > /dev/null +#ssh-add - <<< "$1" ssh -vT git@git.pika-os.com diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 67f5435..ca1ae55 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -24,7 +24,7 @@ jobs: - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.SSH_KEY }} + key: ${{ secrets.GPG_PRIVATE_KEY }} name: id_rsa known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace From 9ac46320c916c7319be84ce4102fe8d6077f220b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:43:59 +0300 Subject: [PATCH 47/67] idk --- .github/workflows/github-pushback.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index ca1ae55..9e122d3 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -24,7 +24,7 @@ jobs: - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.GPG_PRIVATE_KEY }} + key: ${{ secrets.SSH_KEY }} name: id_rsa known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace @@ -32,4 +32,4 @@ jobs: - name: Run env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: ./.github/github_pushback.sh "${{ secrets.SSH_KEY }}" + run: ./.github/github_pushback.sh From 7697f267e7d61546b5d733e6b6a391119ebf2e02 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:55:46 +0300 Subject: [PATCH 48/67] idk --- .github/workflows/github-pushback.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 9e122d3..0a2eb25 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -21,13 +21,10 @@ jobs: - name: Is github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 + - name: Set up SSH + uses: webfactory/ssh-agent@v0.5.3 with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace + ssh-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - name: Run env: From 7004f49a3ca94e8f0b7408c7114e79af12c4b278 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 4 Dec 2024 23:57:36 +0300 Subject: [PATCH 49/67] idk --- .github/workflows/github-pushback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 0a2eb25..b4f62dd 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -24,7 +24,7 @@ jobs: - name: Set up SSH uses: webfactory/ssh-agent@v0.5.3 with: - ssh-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + ssh-private-key: ${{ secrets.SSH_KEY }} - name: Run env: From 9a8eded081939ea29960bb9cc49e62ed8b604430 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 00:01:37 +0300 Subject: [PATCH 50/67] idk --- .github/github_pushback.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index fcd840e..47a13d4 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -1,8 +1,8 @@ #! /bin/bash -#mkdir -p ~/.ssh -#ssh-keyscan pika-os.com >> ~/.ssh/known_hosts -#ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts +mkdir -p ~/.ssh +ssh-keyscan pika-os.com >> ~/.ssh/known_hosts +ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" From 23c49635ce70ed9a19a22d2c33ac3a6999fbc283 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 00:07:17 +0300 Subject: [PATCH 51/67] idk --- .github/github_pushback.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 47a13d4..cb63b1b 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -3,6 +3,7 @@ mkdir -p ~/.ssh ssh-keyscan pika-os.com >> ~/.ssh/known_hosts ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts +echo -e "Host git.pika-os.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" From ba34d99aafc5d4fc6527c125efde6a9aa6745cb9 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 00:11:36 +0300 Subject: [PATCH 52/67] idk --- .github/github_pushback.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index cb63b1b..f9eb459 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -3,7 +3,8 @@ mkdir -p ~/.ssh ssh-keyscan pika-os.com >> ~/.ssh/known_hosts ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts -echo -e "Host git.pika-os.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +#echo -e "Host git.pika-os.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +echo -e "Host git.pika-os.com\n\tIdentityFile ~/.ssh/id_rsa\n\tStrictHostKeyChecking no\n" > ~/.ssh/config #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" From 3b63c81108977eb1558182bfad078d8c737e580d Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 00:14:00 +0300 Subject: [PATCH 53/67] idk --- .github/github_pushback.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index f9eb459..0e5ebfb 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -8,6 +8,8 @@ echo -e "Host git.pika-os.com\n\tIdentityFile ~/.ssh/id_rsa\n\tStrictHostKeyChec #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" +export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" + ssh -vT git@git.pika-os.com # Commit changes to git From a31ecf6061939426cd411957b32b372e39d64d2a Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 15:33:50 +0300 Subject: [PATCH 54/67] idk --- .github/github_pushback.sh | 2 +- .github/workflows/github-pushback.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 0e5ebfb..72eb513 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -4,7 +4,7 @@ mkdir -p ~/.ssh ssh-keyscan pika-os.com >> ~/.ssh/known_hosts ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts #echo -e "Host git.pika-os.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -echo -e "Host git.pika-os.com\n\tIdentityFile ~/.ssh/id_rsa\n\tStrictHostKeyChecking no\n" > ~/.ssh/config +#echo -e "Host git.pika-os.com\n\tIdentityFile ~/.ssh/id_rsa\n\tStrictHostKeyChecking no\n" > ~/.ssh/config #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index b4f62dd..a85bce5 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -24,7 +24,7 @@ jobs: - name: Set up SSH uses: webfactory/ssh-agent@v0.5.3 with: - ssh-private-key: ${{ secrets.SSH_KEY }} + ssh-private-key: ${{ secrets.GITEA_SSH_KEY }} - name: Run env: From 1f4700e218e8520cf820d71f73c48b6196aa6b4a Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 15:43:03 +0300 Subject: [PATCH 55/67] idk --- .github/github_pushback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 72eb513..f7900b7 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -8,7 +8,7 @@ ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts #ssh-agent -a $SSH_AUTH_SOCK > /dev/null #ssh-add - <<< "$1" -export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" +#export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" ssh -vT git@git.pika-os.com From 1703089d0a6783141923ef0a5468b871c66edffb Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 15:45:22 +0300 Subject: [PATCH 56/67] idk --- .github/github_pushback.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index f7900b7..5a58dd9 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -1,8 +1,8 @@ #! /bin/bash mkdir -p ~/.ssh -ssh-keyscan pika-os.com >> ~/.ssh/known_hosts -ssh-keyscan git.pika-os.com >> ~/.ssh/known_hosts +ssh-keyscan -H pika-os.com >> ~/.ssh/known_hosts +ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts #echo -e "Host git.pika-os.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config #echo -e "Host git.pika-os.com\n\tIdentityFile ~/.ssh/id_rsa\n\tStrictHostKeyChecking no\n" > ~/.ssh/config #ssh-agent -a $SSH_AUTH_SOCK > /dev/null From 0362631a11ddc90ce3ad7dd68110b6aca38c27fc Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 15:47:25 +0300 Subject: [PATCH 57/67] idk --- .github/github_pushback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 5a58dd9..d06e5b7 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -10,7 +10,7 @@ ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts #export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" -ssh -vT git@git.pika-os.com +ssh -o StrictHostKeyChecking=no -vT git@git.pika-os.com # Commit changes to git git config --global user.name 'ferreo' From c1aada85238f45c225d342209373013e37a3ea6d Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 15:50:33 +0300 Subject: [PATCH 58/67] idk --- .github/github_pushback.sh | 3 ++- .github/workflows/github-pushback.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index d06e5b7..f355253 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -10,7 +10,8 @@ ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts #export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" -ssh -o StrictHostKeyChecking=no -vT git@git.pika-os.com +#ssh -o StrictHostKeyChecking=no -vT git@git.pika-os.com +ssh -vT git@git.pika-os.com # Commit changes to git git config --global user.name 'ferreo' diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index a85bce5..fa51f11 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -21,10 +21,13 @@ jobs: - name: Is github check run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 - - name: Set up SSH - uses: webfactory/ssh-agent@v0.5.3 + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 with: - ssh-private-key: ${{ secrets.GITEA_SSH_KEY }} + key: ${{ secrets.GITEA_SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace - name: Run env: From 1641c410de3c21aaaa4ece580eca03984d4df553 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:00:26 +0300 Subject: [PATCH 59/67] clean up --- .github/build-nest-v3 | 2 +- .github/github_pushback.sh | 6 +++--- .github/workflows/build-canaryv3.yml | 13 ++++++++++--- .github/workflows/build-nestv3.yml | 13 ++++++++++--- .github/workflows/github-pushback.yml | 13 ++++++++++--- .github/workflows/release-canaryv3.yml | 13 ++++++++++--- .github/workflows/release-nestv3.yml | 13 ++++++++++--- 7 files changed, 54 insertions(+), 19 deletions(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 7f8f011..45a4fb7 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -7 +8 diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index f355253..480b979 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -11,11 +11,11 @@ ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts #export GIT_SSH_COMMAND="ssh -F ~/.ssh/config" #ssh -o StrictHostKeyChecking=no -vT git@git.pika-os.com -ssh -vT git@git.pika-os.com +#ssh -vT git@git.pika-os.com # Commit changes to git -git config --global user.name 'ferreo' -git config --global user.email 'harderthanfire@gmail.com' +git config --global user.name 'Github Gitea Push Back Key - Cosmo' +git config --global user.email 'cosmo@pika-os.com' git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 0e3396d..255a0c8 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -18,10 +18,17 @@ jobs: steps: - - uses: actions/checkout@v3 + - name: Runner Origin Check + run: | + if [ "${{ secrets.RUNNER_ORIGIN }}" = "github" ]; then + exit 1 + else + true + fi + env: + RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 0483ecb..f051808 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -18,10 +18,17 @@ jobs: steps: - - uses: actions/checkout@v3 + - name: Runner Origin Check + run: | + if [ "${{ secrets.RUNNER_ORIGIN }}" = "github" ]; then + exit 1 + else + true + fi + env: + RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index fa51f11..0443b24 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -16,10 +16,17 @@ jobs: steps: - - uses: actions/checkout@v3 + - name: Runner Origin Check + run: | + if [ "${{ secrets.RUNNER_ORIGIN }}" = "github" ]; then + true + else + exit 1 + fi + env: + RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - name: Is github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" || exit 1 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index af44cab..fa53734 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -18,10 +18,17 @@ jobs: steps: - - uses: actions/checkout@v3 + - name: Runner Origin Check + run: | + if [ "${{ secrets.RUNNER_ORIGIN }}" = "github" ]; then + exit 1 + else + true + fi + env: + RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 9945f1d..05ed7ce 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -18,10 +18,17 @@ jobs: steps: - - uses: actions/checkout@v3 + - name: Runner Origin Check + run: | + if [ "${{ secrets.RUNNER_ORIGIN }}" = "github" ]; then + exit 1 + else + true + fi + env: + RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - name: Not github check - run: echo "${PWD##*/}" | grep "gitea-pika-first-setup" && exit 1 + - uses: actions/checkout@v3 - name: Install SSH key uses: shimataro/ssh-key-action@v2 From 6bcd3566d26c3e55db3ed76ee74a388afe4f90f1 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:05:44 +0300 Subject: [PATCH 60/67] fix push issue --- .github/github_pushback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 480b979..ca897f9 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -20,4 +20,4 @@ git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika- git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . git commit -am"Github Mirror Push Back" -git push +git push --force From d119c3588c2d0bdae9b994e6514abf2139642236 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:14:00 +0300 Subject: [PATCH 61/67] fix shallow issue, maybe --- .github/workflows/github-pushback.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 0443b24..630c2bd 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -27,6 +27,8 @@ jobs: RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Install SSH key uses: shimataro/ssh-key-action@v2 From 6bc4f2f5b85a3b823f40e121f0d9e0ba078ada72 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:21:34 +0300 Subject: [PATCH 62/67] get rid of dangerous behivour hopefully --- .github/github_pushback.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index ca897f9..337bfbb 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -20,4 +20,6 @@ git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika- git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . git commit -am"Github Mirror Push Back" -git push --force +git config pull.rebase true +git pull +git push From 5da2886aa9f5f4b923812c4c0a91bce16e7abba6 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:57:04 +0300 Subject: [PATCH 63/67] get rid of dangerous behivour hopefully --- .github/github_pushback.sh | 14 ++++++++++---- .github/workflows/github-pushback.yml | 13 +++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 337bfbb..4838b99 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -16,10 +16,16 @@ ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts # Commit changes to git git config --global user.name 'Github Gitea Push Back Key - Cosmo' git config --global user.email 'cosmo@pika-os.com' -git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup -git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup +#git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup + +git clone git@git.pika-os.com:custom-gui-packages/pika-first-setup + +rm -rfv ./gitea-pika-first-setup/.git +cp ./pika-first-setup/.git ./gitea-pika-first-setup/ + +cd ./gitea-pika-first-setup git add . git commit -am"Github Mirror Push Back" -git config pull.rebase true -git pull +#git config pull.rebase true +#git pull git push diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 630c2bd..edfdde6 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -6,7 +6,7 @@ on: - main jobs: - build: + Push: runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 @@ -26,10 +26,6 @@ jobs: env: RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: @@ -39,6 +35,7 @@ jobs: if_key_exists: replace - name: Run - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: ./.github/github_pushback.sh + run: git clone https://github.com/PikaOS-Linux/gitea-pika-first-setup + + - name: Run + run: ./gitea-pika-first-setup/.github/github_pushback.sh From e7e612409605ae0ace374c9fc20417ffe4a19f69 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 5 Dec 2024 16:59:12 +0300 Subject: [PATCH 64/67] get rid of dangerous behivour hopefully --- .github/github_pushback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 4838b99..ece0584 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -21,7 +21,7 @@ git config --global user.email 'cosmo@pika-os.com' git clone git@git.pika-os.com:custom-gui-packages/pika-first-setup rm -rfv ./gitea-pika-first-setup/.git -cp ./pika-first-setup/.git ./gitea-pika-first-setup/ +cp -rfv ./pika-first-setup/.git ./gitea-pika-first-setup/ cd ./gitea-pika-first-setup git add . From 9140e7c1da3904bed2b1f73661afcecaab141f79 Mon Sep 17 00:00:00 2001 From: Github Gitea Push Back Key - Cosmo Date: Thu, 5 Dec 2024 09:16:25 -0500 Subject: [PATCH 65/67] Github Mirror Push Back --- LICENSE.md | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 16ff30b..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,24 +0,0 @@ -MIT License (With DPKG packaging compatibility) - -Copyright (c) 2024 PikaOS - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Notes: -The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT. From b3e5bb3287d40b8f9cd3c897b97d210cd2566679 Mon Sep 17 00:00:00 2001 From: piaf Date: Thu, 5 Dec 2024 16:51:48 +0000 Subject: [PATCH 66/67] Translated using Weblate (French) Currently translated at 98.2% (56 of 57 strings) Translation: PikaOS Linux/pika-first-setup Translate-URL: https://hosted.weblate.org/projects/pikaos/gui-applications/pika-first-setup/fr/ --- locales/fr_FR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr_FR.json b/locales/fr_FR.json index 8f22c53..688b9d5 100644 --- a/locales/fr_FR.json +++ b/locales/fr_FR.json @@ -1,5 +1,5 @@ { - "app_name": "", + "app_name": "PikaOS Bienvenue", "first_setup_initial_box_text_title": "Bienvenue", "first_setup_initial_box_text_description": "Cet assistant vous aidera à terminer l'installation de PikaOS", "first_setup_start_button_label": "Commençons-nous", From 290582d15a6e7caa35ffcb74517b72340115278a Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Fri, 6 Dec 2024 11:51:49 +0100 Subject: [PATCH 67/67] Added translation using Weblate (Kabyle) --- locales/kab.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 locales/kab.json diff --git a/locales/kab.json b/locales/kab.json new file mode 100644 index 0000000..f5d4844 --- /dev/null +++ b/locales/kab.json @@ -0,0 +1,60 @@ +{ + "app_name": "", + "first_setup_initial_box_text_title": "", + "first_setup_initial_box_text_description": "", + "first_setup_start_button_label": "", + "first_setup_window_headerbar_back_button_label": "", + "first_setup_internet_box_text_title": "", + "first_setup_internet_box_text_description": "", + "internet_skip_button_label": "", + "internet_next_button_label": "", + "first_setup_internet_button_content_text_label": "", + "first_setup_internet_button_content_label": "", + "first_setup_internet_skip_dialog_heading": "", + "first_setup_internet_skip_dialog_body": "", + "first_setup_internet_skip_dialog_skip_cancel_label": "", + "first_setup_internet_skip_dialog_skip_confirm_label": "", + "first_setup_internet_box_text_description_true": "", + "first_setup_internet_box_text_description_false": "", + "first_setup_update_box_text_title": "", + "first_setup_update_button_label": "", + "first_setup_update_skip_button_label": "", + "system_update_dialog_heading": "", + "system_update_dialog_ok_label": "", + "internet_network_disabled": "", + "system_update_dialog_success_true": "", + "system_update_dialog_success_false": "", + "first_setup_user_box_text_title": "", + "first_setup_user_box_text_description": "", + "user_info_username_title": "", + "user_info_full_name_title": "", + "user_info_hostname_title": "", + "user_info_password_title": "", + "user_info_password_verify_title": "", + "error_label_is_root_label": "", + "error_label_is_pikaos_label": "", + "error_label_username_is_invalid_label": "", + "error_label_hostname_is_special_label": "", + "error_label_password_mismatch_label": "", + "first_setup_gameutils_box_text_title": "", + "first_setup_gameutils_box_text_description": "", + "first_setup_gameutils_button_label": "", + "first_setup_gameutils_skip_button_label": "", + "gameutils_install_dialog_heading": "", + "gameutils_install_dialog_success_true": "", + "gameutils_install_dialog_success_false": "", + "first_setup_codec_box_text_title": "", + "first_setup_codec_box_text_description": "", + "first_setup_codec_button_label": "", + "first_setup_codec_skip_button_label": "", + "codec_install_dialog_heading": "", + "codec_install_dialog_success_true": "", + "codec_install_dialog_success_false": "", + "first_setup_driver_box_text_title": "", + "first_setup_driver_box_text_description": "", + "first_setup_driver_button_label": "", + "first_setup_driver_skip_button_label": "", + "first_setup_final_box_text_title": "", + "first_setup_final_box_text_description": "", + "first_setup_reboot_button_label": "" +}