Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Added support for SkiffOS #1664

Merged
merged 2 commits into from
Jun 11, 2021
Merged

Conversation

paralin
Copy link
Contributor

@paralin paralin commented Jan 22, 2021

@paralin paralin force-pushed the add-distro-skiffos branch 6 times, most recently from a9fd31d to 816dd81 Compare January 22, 2021 22:19
@paralin
Copy link
Contributor Author

paralin commented Jan 22, 2021

image

paralin added a commit to paralin/neofetch that referenced this pull request Jan 22, 2021
https://github.com/skiffos/skiffos

Fixes dylanaraps#1664

Signed-off-by: Christian Stewart <christian@paral.in>
@paralin paralin force-pushed the add-distro-skiffos branch 2 times, most recently from 19a168d to 124c015 Compare January 22, 2021 22:35
@paralin paralin force-pushed the add-distro-skiffos branch 5 times, most recently from 2309b69 to d1c528a Compare January 23, 2021 04:30
@paralin
Copy link
Contributor Author

paralin commented Jan 23, 2021

image

@koutsie
Copy link

koutsie commented Mar 22, 2021

LGTM!

neofetch Outdated
Comment on lines 996 to 1001
elif [[ -f /etc/skiffos-release ]]; then
case $distro_shorthand in
on|tiny) distro=SkiffOS ;;
*) distro="SkiffOS ($(cat /etc/skiff-release | grep PRETTY_NAME | awk -F'"' '$0=$2'))"
esac

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Existing detection methods don't work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/etc/os-release:

NAME=SkiffOS
VERSION=2021.02.2-31-g9badfd5
ID=skiff
VERSION_ID=9badfd5
PRETTY_NAME="SkiffOS 2021.02.2-31-g9badfd5"
BUILD_DATE="Thu Jun 10 17:11:44 PDT 2021"
BUILD_USER="paralin@forge"
VERSION_FULL="SkiffOS version 2021.02.2-31-g9badfd5 (paralin@forge) Thu Jun 10 17:11:44 PDT 2021"

/etc/skiff-release

NAME=SkiffOS
VERSION=2021.02.2-31-g9badfd5
ID=skiff
VERSION_ID=9badfd5
PRETTY_NAME="SkiffOS 2021.02.2-31-g9badfd5"
BUILD_DATE="Thu Jun 10 17:11:44 PDT 2021"
BUILD_USER="paralin@forge"
VERSION_FULL="SkiffOS version 2021.02.2-31-g9badfd5 (paralin@forge) Thu Jun 10 17:11:44 PDT 2021"
BUILD_CONFIG="pine64/common,skiff/moduleimg,pine64/phone,apps/docker,skiff/core,core/gentoo"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current master fails on my end, I bisected it to commit 41f75b7b484cca653e0db19b194d99a993dbf5f8

neofetch: line 6364: syntax error near unexpected token )' neofetch: line 6364: "CelOS"*)'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1772 fixed here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK @dylanaraps I simplified it to use existing os-release detection, works fine.

Signed-off-by: Christian Stewart <christian@paral.in>
https://github.com/skiffos/skiffos

Fixes dylanaraps#1657

Signed-off-by: Christian Stewart <christian@paral.in>
@dylanaraps dylanaraps merged commit 1c954ec into dylanaraps:master Jun 11, 2021
@dylanaraps
Copy link
Owner

Thanks again.

@paralin paralin deleted the add-distro-skiffos branch June 11, 2021 06:22
matt-fidd pushed a commit to matt-fidd/neofetch that referenced this pull request Sep 12, 2022
* os: fix syntax error introduced by celos logo

Signed-off-by: Christian Stewart <christian@paral.in>

* Added support for SkiffOS

https://github.com/skiffos/skiffos

Fixes dylanaraps#1657

Signed-off-by: Christian Stewart <christian@paral.in>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Distro request: SkiffOS and Buildroot
3 participants