Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-mysqlbackend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-mysqlbackend
Commits
f5c84576
Unverified
Commit
f5c84576
authored
5 years ago
by
Daniel
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Existing environment variables have higher priority than config
parent
d135061d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
utils/load_settings.sh
+6
-0
6 additions, 0 deletions
utils/load_settings.sh
utils/make_db
+2
-2
2 additions, 2 deletions
utils/make_db
with
8 additions
and
2 deletions
utils/load_settings.sh
+
6
−
0
View file @
f5c84576
...
...
@@ -33,6 +33,9 @@ if [ -z "$MAINPATH" ]; then
export
MAINPATH
fi
# Make a backup of the important environment variables.
my_env
=
$(
export
-p
|
grep
-E
'(MYSQL|DATABASE)'
)
source
"
$MAINPATH
/config.defaults"
if
[[
-r
"
$MAINPATH
/.config"
]]
;
then
...
...
@@ -47,6 +50,9 @@ if [[ -z "$MYSQL_CMD" ]] ; then
exit
1
fi
# Restore backup.
eval
"
$my_env
"
export
MYSQL_CMD
export
MYSQLDUMP_CMD
export
MYSQLADMIN_CMD
...
...
This diff is collapsed.
Click to expand it.
utils/make_db
+
2
−
2
View file @
f5c84576
...
...
@@ -97,7 +97,7 @@ function _setup_mytap() {
echo
MyTAB framework is already installed
[
OK]
return
0
fi
echo
-n
"Installing MyTA
B
framework ... "
echo
-n
"Installing MyTA
P
framework ... "
pushd
libs
>
/dev/null
unzip
-u
mytap
*
.zip
>
/dev/null
pushd
mytap
*
/
>
/dev/null
...
...
@@ -105,7 +105,7 @@ function _setup_mytap() {
popd
>
/dev/null
rm
-r
mytap
*
/
popd
>
/dev/null
echo
[
DONE]
echo
"
[DONE]
"
}
function
install_db
()
{
...
...
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