Commit Graph

142 Commits

Author SHA1 Message Date
LE Manh Cuong
0355095a59 Fix missing quote 2015-10-17 08:49:29 +07:00
David Reuss
ece750b710 Be consistent when creating tmpfiles in stacklib
Use same naming scheme as elsewhere when creating tempfiles.

This fixes deregistering files, when seeing:

```
mktemp: too few X's in template ‘_stacklib_’
```
2015-10-16 14:59:15 +02:00
Tor Arvid Lund
ca2cc76bcd Support having an $EDITOR value with arguments
If a user has $EDITOR set to e.g "subl --wait", then "$EDITOR" (with
quotes) will fail with error "command not found: subl --wait". In other
words, it looks for an executable containing the space and the --wait in
it.

Simply removing the quotes seems to work fine.
2015-08-26 16:15:29 +02:00
Nextraztus
fd78fb5ed3 replace vcs_relative_path with non-python, fixes #115 2015-08-07 08:22:18 -06:00
tal@whatexit.org
7c73009461 Improve Cygwin compatibility. 2015-08-04 11:53:25 -04:00
tlimoncelli@stackexchange.com
343b85a34c 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-07-28 08:21:52 -04:00
tlimoncelli@stackexchange.com
1f2d99436d Fixed #83 blackbox_edit* scripts should accept multiple filenames 2015-07-24 09:57:34 -04:00
tlimoncelli@stackexchange.com
5ae47a69ea Clean up after cp_permission test 2015-07-24 13:13:51 +00:00
tlimoncelli@stackexchange.com
59685d580b Improve comments. 2015-07-24 13:04:23 +00:00
tlimoncelli@stackexchange.com
aee22fc99d Reorganize tests
* Split out test helper functions into tools/test_functions.sh
  * bin/_blackbox_common_test.sh: Unit-tests for functions.
  * blackbox_postdeploy: Use cp_permissions instead of chmod --reference
2015-07-24 09:01:00 -04:00
Maxime Poulin
649a75e459 File permissions now persits 2015-07-23 10:14:39 -04:00
Bob Example
1d6d65af13 resolution to past zeal with double quotes. 2015-07-10 21:16:12 -04:00
Dan OBoyle
1d4edfaa10 Fix change_to_vcs_root in issue #105 2015-07-10 18:34:37 -04:00
Tom Limoncelli
01a6758ab8 Merge pull request #102 from selfcommit/master
Steps towards recursive repos
2015-07-05 12:11:47 -04:00
Dan OBoyle
76884eb396 better logic in enumerate_blackbox_repos 2015-07-03 17:50:00 -04:00
Dan OBoyle
96c71e3254 Better logic for change_to_vcs_root 2015-07-03 17:46:18 -04:00
Dan OBoyle
53c686fc57 document is_blackbox_repo 2015-07-03 17:41:46 -04:00
Dan OBoyle
2b432e1f3a document SC2155 2015-07-03 17:41:21 -04:00
Dan OBoyle
b56300a8c7 better linting in get_encrypted_filename() 2015-07-03 17:28:49 -04:00
Dan OBoyle
a5bf8a5a81 better linting in get_unencrypted_filename() 2015-07-03 17:27:17 -04:00
Dan OBoyle
97030854fa fewer double quotes in fail_if_not_on_cryptlist() 2015-07-03 17:23:34 -04:00
Dan OBoyle
805f66b6b3 Add missing } 2015-07-03 17:21:26 -04:00
Dan OBoyle
38b8ced5dd check if is null before checking for dir 2015-07-03 17:21:00 -04:00
Dan OBoyle
26eb8e48cc Added is_blackbox_repo enumerate_bloackbox_repos and set in change_vcs_root 2015-07-03 13:00:12 -04:00
tlimoncelli@stackexchange.com
eab0418ffe vcs_relative_path broke on MacOS X. 2015-07-03 11:43:52 -04:00
Dan OBoyle
a648fb8e46 Added / Pruned quotes and separated local variable declaration from assignment. 2015-06-28 19:26:47 -04:00
Dan OBoyle
85e1ea7ccc added quotes to fix linting 2015-06-28 19:05:06 -04:00
Tom Limoncelli
4c7078e4c4 Merge pull request #95 from shadone/blackbox_initialize_ignore_file_fix
Fixed initialization
2015-06-27 13:14:49 -04:00
Tom Limoncelli
1cf8b709f4 Merge pull request #96 from shadone/gpg-tool-override
Allow overriding gpg command
2015-06-27 13:12:59 -04:00
Denis Dzyubenko
1aaeb1184e Fixed a typo in a comment 2015-06-27 13:54:48 +02:00
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
Denis Dzyubenko
c66a0befa6 Fixed initialization
IGNOREFILE variable no longer exists which resulted in calling "vcs_add <empty
string>" command adding all untracked files when blackbox_initialize is called
2015-06-27 13:11:51 +02: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
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
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
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
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