Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
8271177a
Commit
8271177a
authored
Mar 26, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Подправил скрипты, чтобы они возвращали корректный значения завершения для…
Подправил скрипты, чтобы они возвращали корректный значения завершения для использования в скриптах на bash..
parent
f7788ecf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
admin.cc
Utilities/Admin/admin.cc
+4
-4
admin.sh
Utilities/Admin/admin.sh
+2
-0
uniset-start.sh
Utilities/scripts/uniset-start.sh
+4
-5
No files found.
Utilities/Admin/admin.cc
View file @
8271177a
...
...
@@ -128,7 +128,6 @@ int main(int argc, char** argv)
int
optindex
=
0
;
char
opt
=
0
;
while
(
(
opt
=
getopt_long
(
argc
,
argv
,
"hc:beomsfur:l:i:x:g:w:y:p:"
,
longopts
,
&
optindex
))
!=
-
1
)
{
switch
(
opt
)
//разбираем параметры
...
...
@@ -181,7 +180,7 @@ int main(int argc, char** argv)
case
'w'
:
//--getRawValue
{
// cout<<"(main):received option --getRawValue='"<<optarg<<"'"<<endl;
// cout<<"(main):received option --getRawValue='"<<optarg<<"'"<<endl;
uniset_init
(
argc
,
argv
,
conffile
);
UniversalInterface
ui
(
conf
);
return
getRawValue
(
optarg
,
ui
);
...
...
@@ -289,9 +288,8 @@ int main(int argc, char** argv)
default:
{
short_usage
();
return
0
;
return
1
;
}
}
}
...
...
@@ -320,6 +318,8 @@ int main(int argc, char** argv)
{
cerr
<<
"неизвестное исключение"
<<
endl
;
}
return
1
;
}
// ==============================================================================================
...
...
Utilities/Admin/admin.sh
View file @
8271177a
#!/bin/sh
./uniset-start.sh
-f
"./uniset-admin --confile test.xml --
`
basename
$0
.sh
`
$1
$2
$3
$4
"
exit
$?
Utilities/scripts/uniset-start.sh
View file @
8271177a
...
...
@@ -60,7 +60,7 @@ then
echo
Running
"
$start_line
"
$start_line
exit
0
exit
$?
fi
if
[
-n
"
$FG
"
]
...
...
@@ -69,20 +69,19 @@ then
if
[
-z
"
$COMLINE
"
]
then
echo
"Не указана команда для запуска"
exit
0
exit
1
fi
COMLINE
=
"
$COMLINE
--uniset-port
$OMNIPORT
"
echo
Запускаем
"
$COMLINE
"
$COMLINE
echo
Выходим
exit
1
exit
$?
fi
if
[
-z
"
$*
"
]
then
echo
"Не указана команда для запуска"
exit
0
exit
1
fi
checkPID
=
$(
echo
"
$1
"
|
grep
pidfile
=
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment