diff --git a/Makefile b/Makefile index 1b68b8d..ba73fd0 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ PKGNAME=stack_blackbox all: @echo 'Menu:' + @echo ' make update Update any generated files' @echo ' make packages Make RPM packages' @echo ' make packages-deb Make DEB packages' @echo ' make install (incomplete)' @@ -53,7 +54,7 @@ packages-deb: tools/mk_deb_fpmdir.stack_blackbox.txt # Make mk_deb_fpmdir.vcs_blackbox.txt from mk_rpm_fpmdir.stack_blackbox.txt: tools/mk_deb_fpmdir.stack_blackbox.txt: tools/mk_rpm_fpmdir.stack_blackbox.txt - sed -e 's@/usr/blackbox/bin/@/usr/bin/@g' -e '/profile.d-usrblackbox.sh/d' $@ + sed -e '/^#/d' -e 's@/usr/blackbox/bin/@/usr/bin/@g' -e '/profile.d-usrblackbox.sh/d' $@ packages-deb-debug: tools/mk_deb_fpmdir.stack_blackbox.txt @echo BUILD: @@ -76,7 +77,7 @@ local-deb: # Make mk_macports.vcs_blackbox.txt from mk_rpm_fpmdir.stack_blackbox.txt: tools/mk_macports.vcs_blackbox.txt: tools/mk_rpm_fpmdir.stack_blackbox.txt - sed -e 's@/usr/blackbox/bin/@bin/@g' -e '/profile.d-usrblackbox.sh/d' $@ + sed -e '/^#/d' -e 's@/usr/blackbox/bin/@bin/@g' -e '/profile.d-usrblackbox.sh/d' $@ # MacPorts expects to run: make packages-macports DESTDIR=${destroot} packages-macports: tools/mk_macports.vcs_blackbox.txt @@ -95,6 +96,14 @@ uninstall-stow: # Add other package types here. +# +# Updates +# +update: tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt + +clean: + rm tools/mk_deb_fpmdir.stack_blackbox.txt tools/mk_macports.vcs_blackbox.txt + # # System Test: # diff --git a/README.md b/README.md index 055837b..8e7309d 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ Commands: | `blackbox_diff` | Diff decrypted files against their original crypted version | | `blackbox_initialize` | Enable blackbox for a GIT or HG repo | | `blackbox_register_new_file` | Encrypt a file for the first time | -| blackbox_deregister_file | Remove a file from blackbox | +| `blackbox_deregister_file` | Remove a file from blackbox | | `blackbox_list_files` | List the files maintained by blackbox | | `blackbox_decrypt_all_files` | Decrypt all managed files (INTERACTIVE) | | `blackbox_postdeploy` | Decrypt all managed files (batch) | diff --git a/tools/mk_deb_fpmdir.stack_blackbox.txt b/tools/mk_deb_fpmdir.stack_blackbox.txt index 287f807..1cdde07 100644 --- a/tools/mk_deb_fpmdir.stack_blackbox.txt +++ b/tools/mk_deb_fpmdir.stack_blackbox.txt @@ -2,8 +2,9 @@ exec /usr/bin/_blackbox_common.sh ../bin/_blackbox_common.sh exec /usr/bin/_stack_lib.sh ../bin/_stack_lib.sh exec /usr/bin/blackbox_addadmin ../bin/blackbox_addadmin exec /usr/bin/blackbox_cat ../bin/blackbox_cat -exec /usr/bin/blackbox_decrypt_all_files ../bin/blackbox_decrypt_all_files -exec /usr/bin/blackbox_diff ../bin/blackbox_diff +exec /usr/bin/blackbox_decrypt_all_files ../bin/blackbox_decrypt_all_files +exec /usr/bin/blackbox_deregister_file ../bin/blackbox_deregister_file +exec /usr/bin/blackbox_diff ../bin/blackbox_diff exec /usr/bin/blackbox_edit ../bin/blackbox_edit exec /usr/bin/blackbox_edit_end ../bin/blackbox_edit_end exec /usr/bin/blackbox_edit_start ../bin/blackbox_edit_start diff --git a/tools/mk_macports.vcs_blackbox.txt b/tools/mk_macports.vcs_blackbox.txt index 852e7ed..8fa0001 100644 --- a/tools/mk_macports.vcs_blackbox.txt +++ b/tools/mk_macports.vcs_blackbox.txt @@ -3,6 +3,7 @@ exec bin/_stack_lib.sh ../bin/_stack_lib.sh exec bin/blackbox_addadmin ../bin/blackbox_addadmin exec bin/blackbox_cat ../bin/blackbox_cat exec bin/blackbox_decrypt_all_files ../bin/blackbox_decrypt_all_files +exec bin/blackbox_deregister_file ../bin/blackbox_deregister_file exec bin/blackbox_diff ../bin/blackbox_diff exec bin/blackbox_edit ../bin/blackbox_edit exec bin/blackbox_edit_end ../bin/blackbox_edit_end diff --git a/tools/mk_rpm_fpmdir.stack_blackbox.txt b/tools/mk_rpm_fpmdir.stack_blackbox.txt index 0f1b0b5..dd88283 100644 --- a/tools/mk_rpm_fpmdir.stack_blackbox.txt +++ b/tools/mk_rpm_fpmdir.stack_blackbox.txt @@ -1,9 +1,11 @@ +# Update tools/mk_rpm_fpmdir.stack_blackbox.txt. Other files generate from it. read /etc/profile.d/usrblackbox.sh profile.d-usrblackbox.sh exec /usr/blackbox/bin/_blackbox_common.sh ../bin/_blackbox_common.sh exec /usr/blackbox/bin/_stack_lib.sh ../bin/_stack_lib.sh exec /usr/blackbox/bin/blackbox_addadmin ../bin/blackbox_addadmin exec /usr/blackbox/bin/blackbox_cat ../bin/blackbox_cat exec /usr/blackbox/bin/blackbox_decrypt_all_files ../bin/blackbox_decrypt_all_files +exec /usr/blackbox/bin/blackbox_deregister_file ../bin/blackbox_deregister_file exec /usr/blackbox/bin/blackbox_diff ../bin/blackbox_diff exec /usr/blackbox/bin/blackbox_edit ../bin/blackbox_edit exec /usr/blackbox/bin/blackbox_edit_end ../bin/blackbox_edit_end