Skip to content

Commit 38bd300

Browse files
authored
Merge pull request #12 from ivanbrennan/rename-shellbit
Rename to shellbit
2 parents 4f9530b + 3a55954 commit 38bd300

35 files changed

Lines changed: 264 additions & 263 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PROJECT_NAME ?= nix-shell-bit
1+
PROJECT_NAME ?= shellbit
22
PROJECT_ROOT ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
33

44
NIXPKGS_OWNER ?= NixOS

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## nix-shell-bit
1+
## shellbit
22

33
Launch a nix-shell for the current project.
44
```sh
5-
nix-shell-bit
5+
shellbit
66
```
77

88
## install / uninstall

app/nix-shell-bit.hs

Lines changed: 0 additions & 6 deletions
This file was deleted.

app/shellbit.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module Main where
2+
3+
import Shellbit.Main (shellbit)
4+
5+
main :: IO ()
6+
main = shellbit
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_nix-shell-bit()
1+
_shellbit()
22
{
33
local CMDLINE
44
local IFS=$'\n'
@@ -8,7 +8,7 @@ _nix-shell-bit()
88
CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
99
done
1010

11-
COMPREPLY=( $(nix-shell-bit "${CMDLINE[@]}") )
11+
COMPREPLY=( $(shellbit "${CMDLINE[@]}") )
1212
}
1313

14-
complete -o filenames -F _nix-shell-bit nix-shell-bit
14+
complete -o filenames -F _shellbit shellbit
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#compdef nix-shell-bit
1+
#compdef shellbit
22

33
local request
44
local completions
@@ -10,7 +10,7 @@ for arg in ${words[@]}; do
1010
request=(${request[@]} --bash-completion-word $arg)
1111
done
1212

13-
IFS=$'\n' completions=($( nix-shell-bit "${request[@]}" ))
13+
IFS=$'\n' completions=($( shellbit "${request[@]}" ))
1414

1515
for word in $completions; do
1616
local -a parts

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
, transformers, typed-process, unix, unliftio
66
}:
77
mkDerivation {
8-
pname = "nix-shell-bit";
8+
pname = "shellbit";
99
version = "0.1.0.0";
1010
src = ./.;
1111
isLibrary = true;

nix/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let
77

88
hlib = haskell.lib;
99

10-
pkg = hlib.generateOptparseApplicativeCompletion "nix-shell-bit" (
10+
pkg = hlib.generateOptparseApplicativeCompletion "shellbit" (
1111
hlib.buildStrictly (
1212
(hlib.justStaticExecutables drv).overrideAttrs (old: rec {
1313
GHC_ENVIRONMENT = "-"; # ignore ghc environment files
@@ -29,11 +29,11 @@ let
2929
in
3030
rec {
3131
minimal = pkg.overrideAttrs (old: rec {
32-
name = "nix-shell-bit";
32+
name = "shellbit";
3333
});
3434

3535
full = buildEnv {
36-
name = "nix-shell-bit-full";
36+
name = "shellbit-full";
3737
paths = [ pkg ] ++ runtimeDeps;
3838
};
3939

nix/scripts/generate-completions.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ in
1010
1111
cd ${projectRoot} >/dev/null
1212
13-
cabal v2-exec --verbose=0 nix-shell-bit \
13+
cabal v2-exec --verbose=0 shellbit \
1414
-- \
15-
--bash-completion-script nix-shell-bit \
16-
> completions/_nix-shell-bit.bash
15+
--bash-completion-script shellbit \
16+
> completions/_shellbit.bash
1717
18-
cabal v2-exec --verbose=0 nix-shell-bit \
18+
cabal v2-exec --verbose=0 shellbit \
1919
-- \
20-
--zsh-completion-script nix-shell-bit \
21-
> completions/_nix-shell-bit.zsh
20+
--zsh-completion-script shellbit \
21+
> completions/_shellbit.zsh
2222
2323
exit
2424
'';
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: nix-shell-bit
1+
name: shellbit
22
version: 0.1.0.0
33
cabal-version: >=1.10
44
author: ivanbrennan
@@ -16,19 +16,19 @@ extra-source-files:
1616

1717
library
1818
exposed-modules:
19-
NixShellBit.Config
20-
NixShellBit.Git
21-
NixShellBit.Main
22-
NixShellBit.Nix
23-
NixShellBit.Operation
24-
NixShellBit.Options
25-
NixShellBit.PPrint
26-
NixShellBit.Project
27-
NixShellBit.Version
28-
NixShellBit.Column
19+
Shellbit.Config
20+
Shellbit.Git
21+
Shellbit.Main
22+
Shellbit.Nix
23+
Shellbit.Operation
24+
Shellbit.Options
25+
Shellbit.PPrint
26+
Shellbit.Project
27+
Shellbit.Version
28+
Shellbit.Column
2929
other-modules:
30-
NixShellBit.Line
31-
Paths_nix_shell_bit
30+
Paths_shellbit
31+
Shellbit.Line
3232
build-depends:
3333
aeson >= 1.4 && < 1.5
3434
, ansi-wl-pprint >= 0.6 && < 0.7
@@ -57,31 +57,31 @@ library
5757
ghc-options: -Wall -O2
5858
default-language: Haskell2010
5959

60-
executable nix-shell-bit
61-
main-is: nix-shell-bit.hs
60+
executable shellbit
61+
main-is: shellbit.hs
6262
build-depends:
6363
base
64-
, nix-shell-bit
64+
, shellbit
6565
hs-source-dirs:
6666
app
6767
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
6868
default-language: Haskell2010
6969

70-
test-suite nix-shell-bit-test
70+
test-suite shellbit-test
7171
type: exitcode-stdio-1.0
7272
main-is: Spec.hs
7373
other-modules:
74-
NixShellBit.ColumnSpec
75-
NixShellBit.ConfigSpec
76-
NixShellBit.GitSpec
77-
NixShellBit.MainSpec
78-
NixShellBit.NixSpec
79-
NixShellBit.OperationSpec
80-
NixShellBit.OptionsSpec
81-
NixShellBit.PPrintSpec
82-
NixShellBit.ProjectSpec
83-
NixShellBit.Sbox
84-
NixShellBit.VersionSpec
74+
Shellbit.ColumnSpec
75+
Shellbit.ConfigSpec
76+
Shellbit.GitSpec
77+
Shellbit.MainSpec
78+
Shellbit.NixSpec
79+
Shellbit.OperationSpec
80+
Shellbit.OptionsSpec
81+
Shellbit.PPrintSpec
82+
Shellbit.ProjectSpec
83+
Shellbit.Sbox
84+
Shellbit.VersionSpec
8585
Test.Sandbox
8686
Test.Utils
8787
hs-source-dirs:
@@ -96,9 +96,9 @@ test-suite nix-shell-bit-test
9696
, filepath
9797
, hspec
9898
, main-tester
99-
, nix-shell-bit
10099
, optparse-applicative
101100
, regex-tdfa
101+
, shellbit
102102
, temporary
103103
, text
104104
, typed-process

0 commit comments

Comments
 (0)