Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raT
backupninja
Commits
fa8301c9
Commit
fa8301c9
authored
6 years ago
by
Jérôme Charaoui
Browse files
Options
Downloads
Plain Diff
Merge branch 'version_option' into 'master'
New option "--version" See merge request riseuplabs/backupninja!18
parents
623b777a
b8432d98
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
man/backupninja.1
+4
-1
4 additions, 1 deletion
man/backupninja.1
src/Makefile.am
+2
-1
2 additions, 1 deletion
src/Makefile.am
src/backupninja.in
+3
-0
3 additions, 0 deletions
src/backupninja.in
with
9 additions
and
2 deletions
man/backupninja.1
+
4
−
1
View file @
fa8301c9
...
...
@@ -21,7 +21,7 @@ BACKUPNINJA \- A lightweight, extensible meta-backup system
.I
"a silent flower blossom death strike to lost data."
.SH SYNOPSIS
.B "backupninja [ \-h ] [ \-d ] [ \-n ] [ \-t ] [ \-f filename ] [ \-\-run filename ]"
.B "backupninja [ \-h ] [
\-v ] [
\-d ] [ \-n ] [ \-t ] [ \-f filename ] [ \-\-run filename ]"
.br
.SH DESCRIPTION
.B Backupninja
...
...
@@ -71,6 +71,9 @@ burn CD/DVDs or create ISOs.
.B \-h, \-\-help
Show summary of options
.TP
.B \-v, \-\-version
Show backupninja version number
.TP
.B \-d, \-\-debug
Run in debug mode, where all log messages are output to the current shell.
.TP
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
2
−
1
View file @
fa8301c9
...
...
@@ -15,7 +15,8 @@ edit = sed \
-e
's,@datadir\@,
$(
pkgdatadir
)
,g'
\
-e
"s,@libdir
\@
,
$(
pkglibdir
)
,g"
\
-e
's,@localstatedir\@,
$(
localstatedir
)
,g'
\
-e
's,@prefix\@,
$(
prefix
)
,g'
-e
's,@prefix\@,
$(
prefix
)
,g'
\
-e
's,@PACKAGE_VERSION\@,
$(
PACKAGE_VERSION
)
,g'
#install-exec-hook:
...
...
This diff is collapsed.
Click to expand it.
src/backupninja.in
+
3
−
0
View file @
fa8301c9
...
...
@@ -278,6 +278,7 @@ script is run hourly from cron.
The following options are available:
-h, --help This usage message
-v, --version Show backupninja version number
-d, --debug Run in debug mode, where all log messages are
output to the current shell.
-f, --conffile FILE Use FILE for the main configuration instead
...
...
@@ -431,12 +432,14 @@ function process_action() {
setupcolors
conffile
=
"@CFGDIR@/backupninja.conf"
loglevel
=
3
version
=
"@PACKAGE_VERSION@"
## process command line options
while
[
$#
-ge
1
]
;
do
case
$1
in
-h
|
--help
)
usage
;;
-v
|
--version
)
echo
"backupninja
$version
"
;;
-d
|
--debug
)
debug
=
1
;
export
BACKUPNINJA_DEBUG
=
yes
;;
-t
|
--test
)
test
=
1
;
debug
=
1
;;
-n
|
--now
)
processnow
=
1
;;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment