Skip to content

Commit

Permalink
feat: v4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
justchokingaround committed Jun 16, 2024
1 parent cff0995 commit 685ec43
Show file tree
Hide file tree
Showing 8 changed files with 498 additions and 498 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.sh]
indent_style = space
indent_size = 4
switch_case_indent = true
4 changes: 2 additions & 2 deletions .github/workflows/inverse-lobster.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Added due to required but conditional checks
# Read more: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks#handling-skipped-but-required-checks

name: 'lobster checks'
name: "lobster checks"
on:
pull_request:
paths-ignore:
- "**lobster"
- "lobster.sh"
jobs:
sh-checker:
name: Shellcheck + Shfmt
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/lobster.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: 'lobster checks'
name: "lobster checks"
on:
push:
branches:
- main
pull_request:
paths:
- "**lobster"
paths:
- "lobster.sh"

jobs:
sh-checker:
name: Shellcheck + Shfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run the sh-checker
uses: luizm/action-sh-checker@master
env:
SHELLCHECK_OPTS: -s sh -o all -e 2250
SHFMT_OPTS: -i 4 -ci -d
- uses: actions/checkout@v3
- name: Run the sh-checker
uses: luizm/action-sh-checker@master
env:
SHELLCHECK_OPTS: -s sh -o all -e 2250
SHFMT_OPTS: -i 4 -ci -d

check-exec:
name: Executable Bit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: test exec bit
run: test -x "./lobster.sh"
- uses: actions/checkout@v3
- name: test exec bit
run: test -x "./lobster.sh"
17 changes: 8 additions & 9 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: 'lobster checks'
name: "lobster checks"
on:
pull_request:
paths:
- "**lobster"

paths:
- "lobster.sh"
jobs:
version-bump:
name: Version Bump
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: check version bump
run: git diff origin/master | grep LOBSTER_VERSION
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: check version bump
run: git diff origin/main | grep LOBSTER_VERSION
43 changes: 23 additions & 20 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ coreutils,
{
coreutils,
curl,
fetchFromGitHub,
ffmpeg,
fzf,
gnugrep,
Expand All @@ -11,12 +11,13 @@
makeWrapper,
mpv,
openssl,
awk,
stdenv,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lobster";
version = "4.1.1";
version = "4.3.0";

src = ./.;
# src = fetchFromGitHub {
Expand All @@ -38,25 +39,27 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
mpv
openssl
awk
];

installPhase = ''
mkdir -p $out/bin
cp lobster.sh $out/bin/lobster
wrapProgram $out/bin/lobster \
--prefix PATH : ${lib.makeBinPath [
coreutils
curl
ffmpeg
fzf
gnugrep
gnupatch
gnused
html-xml-utils
mpv
openssl
]}
'';
mkdir -p $out/bin
cp lobster.sh $out/bin/lobster
wrapProgram $out/bin/lobster \
--prefix PATH : ${lib.makeBinPath [
coreutils
curl
ffmpeg
fzf
gnugrep
gnupatch
gnused
html-xml-utils
mpv
openssl
awk
]}
'';

passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
Expand All @@ -66,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "CLI to watch Movies/TV Shows from the terminal";
homepage = "https://github.com/justchokingaround/lobster";
license = licenses.gpl3;
maintainers = with maintainers; [ benediktbroich ];
maintainers = with maintainers; [benediktbroich];
platforms = platforms.unix;
};
})
22 changes: 0 additions & 22 deletions examples/lobster_config.txt

This file was deleted.

21 changes: 12 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
with import nixpkgs { system = "${system}"; };
let
pkgs = import nixpkgs { inherit system; };
in {
packages.lobster = callPackage ./default.nix { };
packages.default = self.packages.${system}.lobster;
});
outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (system:
with import nixpkgs {system = "${system}";}; let
pkgs = import nixpkgs {inherit system;};
in {
packages.lobster = callPackage ./default.nix {};
packages.default = self.packages.${system}.lobster;
});
}
Loading

0 comments on commit 685ec43

Please sign in to comment.