Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (355 commits)
  neofetch: Fix naming conflict with mine. See dylanaraps#1616
  NixOS - squash logo, add new package location. (dylanaraps#1617)
  neofetch: swap to apt for packages. Possible fix for dylanaraps#1616
  Add Apple Music (dylanaraps#1611)
  Fix font support for yakuake (dylanaraps#1615)
  Refactor ueberzug (dylanaraps#1614)
  New Garuda Neofetch Logo (dylanaraps#1613)
  Add support for `swupd` package manager (dylanaraps#1610)
  disk: Fix bash 3.2 incompatibility. Closes dylanaraps#1586
  fix whitespace
  fix macOS issue. See dylanaraps#1607
  update man page (dylanaraps#1600)
  Support multiple displays under wayland (dylanaraps#1596)
  Update SEMC logo (dylanaraps#1593)
  feat(backend): add viu image backend (dylanaraps#1592)
  neofetch: Use MemAvailable for memory on Linux if supported. Closes dylanaraps#1591
  Update NixOS Logo (dylanaraps#1590)
  update garuda linux logo (dylanaraps#1579)
  Adding support for Pengwin (dylanaraps#1578)
  various: fix windows issues
  ...
  • Loading branch information
phdenzel committed Apr 30, 2021
2 parents e80e051 + 6dd85d6 commit 23f8d11
Show file tree
Hide file tree
Showing 7 changed files with 3,303 additions and 4,109 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

If you're suggesting a new feature then just a description will suffice.

- [ ] Does this issue still occur in the master branch? (**Required if issue**)


#### Neofetch version

Expand Down
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi

install:
# Install a custom version of shellcheck instead of Travis CI's default
- scversion="latest" # or "v0.4.7", or "latest"
- wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz"
- tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz"
- shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; }

script:
- time ./neofetch --travis -v
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 -e SC2243 neofetch; fi
Expand Down
Loading

0 comments on commit 23f8d11

Please sign in to comment.