george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
251 Commits 2 Branches 20 Tags
cef09190e969d4366fe752dd6a6c1c5ccbb14350
Commit Graph

251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Denis Dzyubenko
cef09190e9 Allow overriding gpg command 
This is particular useful on OS X when gnupg version 2 is installed with brew
which installs it as gpg2
 2015-06-27 13:40:45 +02:00
tlimoncelli@stackexchange.com
521d108df9 confidence_test.sh: Verify that invalid key names get an error 2015-06-20 20:05:52 +00:00
tlimoncelli@stackexchange.com
7c99a8f94c Merge branch 'fidian-optimize-vcs-type' 2015-06-20 19:11:48 +00:00
tlimoncelli@stackexchange.com
efe7bbc8cd Removing the multiple calls to determine VCS type. 
* Credit goes to fidian@rumkin.com
 2015-06-20 19:10:37 +00:00
tlimoncelli@stackexchange.com
64e019c8e6 Remove call to _determine_vcs_base_and_type. 2015-06-20 19:10:02 +00:00
Alice Example
b523067536 Merge branch 'optimize-vcs-type' of git://github.com/fidian/blackbox into fidian-optimize-vcs-type 2015-06-20 19:02:45 +00:00
tlimoncelli@stackexchange.com
415b55b1c7 Document that register supports many files 2015-06-20 14:56:17 -04:00
tlimoncelli@stackexchange.com
d45625086a blackbox_register_new_file: Accept multiple files on the command line. 2015-06-20 15:54:08 +00:00
tlimoncelli@stackexchange.com
c0dda22c9c Bug: blackbox_deregister_file deletes blackbox-files.txt 
* Clarified symantics of blackbox_deregister_file in comments.
  * Added confidence test
 2015-06-20 15:39:32 +00:00
Tyler Akins
cc1d7a1851 Removing the multiple calls to determine VCS type 
This removed the subshell from _determine_vcs_base_and_type so it can
set environment variables.

Because this always runs at the beginning of the scripts, there's no
need to do checking if REPOBASE is unset or if VCS_TYPE is not yet
determined, thus I simplified one function and eliminated which_vcs.

Conflicts:
	bin/blackbox_deregister_file

I found this easier to just cherry pick since there was a merge and the
merge was reverted.
 2015-06-16 17:24:35 -05:00
tlimoncelli@stackexchange.com
11b2cae683 Merge branch 'fidian-optimizations' 2015-06-16 17:14:20 -04:00
tlimoncelli@stackexchange.com
78fd5d42ec Merge branch 'optimizations' of https://github.com/fidian/blackbox into fidian-optimizations 2015-06-16 17:12:52 -04:00
tlimoncelli@stackexchange.com
4466c202fb Revert "Merge pull request #89 from fidian/optimize-vcs-type" 
This reverts commit 082809bab2, reversing
changes made to 33429b3ca6.
 2015-06-16 17:11:22 -04:00
Tom Limoncelli
082809bab2 Merge pull request #89 from fidian/optimize-vcs-type 
Reduced number of calls to _determine_vcs_base_and_type
 2015-06-16 17:05:22 -04:00
Tyler Akins
792d11e85a Removing the multiple calls to determine VCS type 
This removed the subshell from _determine_vcs_base_and_type so it can
set environment variables.

Because this always runs at the beginning of the scripts, there's no
need to do checking if REPOBASE is unset or if VCS_TYPE is not yet
determined, thus I simplified one function and eliminated which_vcs.
 2015-06-16 14:11:46 -05:00
Tyler Akins
6de7cd99cb Always setting BLACKBOX_HOME 
This makes the beginning of all files the same and a little simpler.

`${0%/*}` turns "/home/user/repository/bin/blackbox_edit" into
"/home/user/repository/bin", exactly like basename but without eating a
process.

Because other scripts needed `$blackbox_home` I made this into a
standardard variable that's always available.

This also loads _stack_lib.sh always because _blackbox_common.sh
requires it.
 2015-06-16 13:25:55 -05:00
tlimoncelli@stackexchange.com
33429b3ca6 Improve GPG 1.x compatibility. 2015-06-15 20:33:50 +00:00
tlimoncelli@stackexchange.com
a3fc4cbf4a Simplify handling of "SECRETSEXPOSED" 2015-06-15 20:33:21 +00:00
tlimoncelli@stackexchange.com
c129d06ea0 is_on_cryptlist reversed arguments to file_contains_line() 2015-06-15 20:32:35 +00:00
tlimoncelli@stackexchange.com
12943b3021 Update confidence tests 
* assert_line_exists: error message text is reversed.
  * Update assertions to work with newer ignore processing.
  * Report "SUCCESS" not just "DONE".
 2015-06-15 20:30:20 +00:00
Tom Limoncelli
e0f7f88beb Merge pull request #85 from fidian/deregister 
Adding blackbox_deregister_file
 2015-06-15 14:27:04 -04:00
Tyler Akins
3968dab7c8 This line should not have continued to exist 
The line immediately afterwards was what was intended.
 2015-06-15 12:32:44 -05:00
Tyler Akins
af7db40263 Using make_self_deleting_tempfile 
I missed this function earlier
 2015-06-15 12:31:50 -05:00
Tyler Akins
287b97ccd6 Pulling greps into a common function 
This will help eliminate problems and make searching consistent
 2015-06-15 12:29:44 -05:00
Tyler Akins
6e04e42f4a Updated to use remove_line 
I didn't notice this earlier
 2015-06-15 12:22:39 -05:00
tlimoncelli@stackexchange.com
161117242e Packages should be built for all architectures 2015-06-14 19:33:21 -04:00
Tom Limoncelli
e79f87f9b3 Merge pull request #87 from jvasile/master 
Enable installation/removal via stow
 2015-06-14 19:17:41 -04:00
James Vasile
cf170d957c Enable installation/removal via stow 
fpm failed on my Debian box, so I used stow. I thought others might be
in the same boat, so here's a couple targets for the Makefile.
 2015-06-14 18:01:06 -04:00
Tyler Akins
83249517a5 Updating wording to remove the "manual" bit. 
Not sure how this should get phrased, thus it's a separate commit.
 2015-06-12 13:31:26 -05:00
Tyler Akins
db9b2eef60 Using """x""" is identical to "x" 2015-06-12 13:27:42 -05:00
Tyler Akins
01e681035d Adding file deregister tool + extrapolating code 
This solves some TODOs by moving shared code out into
`_blackbox_common.sh`.

New VCS commands were added, `vcs_ignore` and `vcs_notice` (the
opposite of ignore).

Made some utility functions

* `remove_filename_from_cryptlist` - The opposite of `add_file_to_cryptlist`
* `remove_line` - Removes a single line from a text file
 2015-06-12 13:23:45 -05:00
Tyler Akins
501c09ccd5 Removing TODO - it was completed earlier 2015-06-12 10:20:00 -05:00
tlimoncelli@stackexchange.com
2a839f1520 Fix path to blackbox_postdeploy 2015-06-03 15:34:01 -04:00
Tom Limoncelli
3bcb76c129 Merge pull request #82 from jlesquembre/keyring_new_format 
GnuPG 2.1 keyring default extension is '.kbx'
 2015-06-02 16:35:36 -04:00
José Luis Lafuente
bef40214b8 Merge remote-tracking branch 'upstream/master' into keyring_new_format 2015-06-02 21:47:23 +02:00
tlimoncelli@stackexchange.com
592c726b1d Update file list 2015-06-02 11:38:24 -04:00
tlimoncelli@stackexchange.com
02700b547a Update comments and add newly added files to packages. 2015-06-02 15:37:06 +00:00
tlimoncelli@stackexchange.com
9ba966445f fixup! 2015-06-02 11:12:15 -04:00
tlimoncelli@stackexchange.com
24ee6b3923 NEW: blacbox_decrypt_all_files: A wrapper around blackbox_postdeploy 
which sets up the gpg-agent.
 2015-06-02 11:11:27 -04:00
Tom Limoncelli
6392a475e5 Merge pull request #79 from appropriate/clean-cat-output 
Send non-file output from blackbox_cat to STDERR
 2015-06-02 10:51:05 -04:00
José Luis Lafuente
6489733299 Fix, GnuPG 2.1 keyring default extension is '.kbx' 2015-05-26 12:28:45 +02:00
Mike Dillon
9a0905a139 Send non-file output from blackbox_cat to STDERR 2015-05-14 09:36:13 -07:00
Tom Limoncelli
fbbadd658c Merge pull request #78 from johnmichel/master 
Fix issue on OS X when creating a temporary file
 2015-05-13 15:01:50 -04:00
John Michel
56232aafc8 Fix issue on OS X when creating a temporary file 
This prevents the "mktemp: too few X's in template ‘_stacklib_’" error message from appearing when adding another admin to blackbox and allows the command to successfully execute.

Related:
rtomayko/shocco#5
http://unix.stackexchange.com/q/87638/63283
 2015-05-13 14:17:38 -04:00
Tom Limoncelli
d960a59904 Merge pull request #77 from pombreda/patch-1 
Fixed Minute typo
 2015-05-10 14:57:09 -04:00
Philippe Ombredanne
c3fa7a8261 Fixed Minute typo 2015-05-10 09:41:01 +02:00
tlimoncelli@stackexchange.com
4a5787cad8 Add support for using the commands outside of a repo. 2015-05-01 15:44:09 +00:00
Tom Limoncelli
ba503c33a4 Merge pull request #71 from dorfsmay/readme-add-dependency 
Add a dependency to build deb packages.
 2015-04-06 09:30:06 -04:00
Yves Dorfsman
7604c10be2 Add a dependency to build deb packages. 
Maybe a full blown dependencies section would be better? I suspect there are more, but I don't know about them because they are already installed on my machine.
 2015-04-04 11:08:16 -06:00
tlimoncelli@stackexchange.com
05edc204ae Merge branch 'salekseev-feature_p4_support' 2015-04-01 11:41:24 -04:00