diff options
| -rw-r--r-- | trunk/doc/CHANGELOG | 30 | ||||
| -rwxr-xr-x | trunk/src/jail-commit | 8 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 8 |
3 files changed, 34 insertions, 12 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 270379d..5a3949f 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -4,9 +4,9 @@ simplepkg changelog 0.5pre1 ======= - - repos: cosmetic changes + Lots of changes! - - jail-commit warning for file not found + - repos: cosmetic changes - lspkg: - support for $ROOT env variable @@ -33,12 +33,32 @@ simplepkg changelog - /etc/simplepkg/templates/template_name.template - /etc/simplepkg/templates/template_name/template_name.template - - jail-update renamed to jail-commit + - jail-update + - old script renamed to jail-commit + - now update a jail from a template + - svn repository support + + - jail-commit + - new script, commit changes from a jail to the templates + - svn repository support - templatepkg: - -a option changed to add files into a template - -u option now updated a template + - major rewrite + - svn repository support - now supports a tagfile or slack-required as a template + - new/changed options + -c | --create: improvements + -a | --add: changed to add files into a template + -u | --update: update a template + -d | --delete: delete files or folders from a template + -s | --sync: sync /etc/simplepkg/templates working copy + -e | --export: export /etc/simplepkg/templates to a svn repository + -i | --import: grab /etc/simplepkg/templates from a svn repository + -r | --remove: remove a template + -l | --list: list templates + -p | --post-install: add or edit post-installation scripts + -t | --template-edit: edit template package list + -h | --help: display this summary 0.4.9pre18-23 ============= diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index 9e2a031..1d5de09 100755 --- a/trunk/src/jail-commit +++ b/trunk/src/jail-commit @@ -30,9 +30,9 @@ fi function usage { echo $BASENAME: commit a jail configuration into a template - echo "usage: $BASENAME [<jail-path> [template]]" - echo " $BASENAME --all to commit all templates" - echo " $BASENAME --help for help" + echo "usage: \'$BASENAME [<jail-path> [template]]\'" + echo " \'$BASENAME --all\' to commit all templates" + echo " \'$BASENAME --help\' for help" } @@ -138,8 +138,10 @@ elif [ "$1" == "--all" ]; then elif echo $1 | grep -q -e "^--"; then usage elif [ ! -z "$1" ]; then + echo "This is jail-commit; Run \'$BASENAME --help\' for help" do_commit $1 $2 else + echo "This is jail-commit; Run \'$BASENAME --help\' for help" if [ -f $JAIL_LIST ]; then for jailpath in `cat $JAIL_LIST`; do do_commit $jailpath diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg index 858911d..097ff1b 100755 --- a/trunk/src/templatepkg +++ b/trunk/src/templatepkg @@ -60,7 +60,7 @@ function usage { echo "" echo " $BASENAME -e <svn-repository>" echo "" - echo " -i | --import: grab /etc/simplepkg/templates from a svn repository:" + echo " -i | --import: grab $BASE_CONF/templates from a svn repository:" echo "" echo " $BASENAME -i <svn-repository>" echo "" @@ -562,7 +562,7 @@ function template_post_install_edit { vi $TEMPLATE_BASE.s/$1 fi if [ "$sha1sum" != "`sha1sum $TEMPLATE_BASE.s/$1`" ]; then - echo $BASENAME: please run jail-commit to send changes to the repository + echo $BASENAME: please run \'jail-commit --all\' to send changes to the repository fi else @@ -574,7 +574,7 @@ function template_post_install_edit { if [ -d "$TEMPLATE_BASE.s/.svn" ]; then cd $TEMPLATE_BASE.s svn add $1 - echo "$BASENAME: please run jail-commit to send the script to the repository" + echo "$BASENAME: please run \'jail-commit --all\' to send the script to the repository" fi echo "$BASENAME: script created; run templatepkg -p `basename $TEMPLATE_BASE` $1 again to edit it" @@ -600,7 +600,7 @@ function template_edit { vi $TEMPLATE_BASE.template fi if [ "$sha1sum" != "`sha1sum $TEMPLATE_BASE.template`" ]; then - echo $BASENAME: please run jail-commit to send changes to the repository + echo $BASENAME: please run \'jail-commit --all\' to send changes to the repository fi else echo $BASENAME: file not found: $TEMPLATE_BASE.template |