Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
3ee376a6
Commit
3ee376a6
authored
Jul 24, 2018
by
eric pellegrini
Browse files
Debugging bad sed command
parent
d5504634
Changes
4
Hide whitespace changes
Inline
Side-by-side
BuildServer/Unix/Debian/definitions.sh
View file @
3ee376a6
...
...
@@ -4,5 +4,5 @@ export DISTRO=$(lsb_release -c | cut -f2)
export
PYTHONEXE
=
/usr/bin/python
export
SED_I_COMMAND
=
'
sed -i
'
export
SED_I_COMMAND
=
(
sed
-i
)
BuildServer/Unix/MacOS/definitions.sh
View file @
3ee376a6
...
...
@@ -5,5 +5,5 @@ export DISTRO=macOS
export
PYTHONEXE
=
/usr/bin/python
# The sed -i"" is compulsory other crashes on macos
export
SED_I_COMMAND
=
'
sed -i ""
'
export
SED_I_COMMAND
=
(
sed
-i
""
)
BuildServer/Unix/MacOS/deploy.sh
View file @
3ee376a6
...
...
@@ -63,7 +63,6 @@ install_name_tool -id @loader_path/libpython2.7.dylib ${MDANSE_APP_DIR}/Contents
ln
-s
../Resources/bin/python
${
MDANSE_APP_DIR
}
/Contents/MacOS/python
# Do some manual cleanup, e.g.
#rm ${MDANSE_APP_DIR}/Contents/Resources/lib/python2.7/MDANSE/__pkginfo__.py\"\"
# matplotlib/tests ==> 45.2 Mb
#rm -rf ${MDANSE_APP_DIR}/Contents/Resources/lib/python2.7/matplotlib/tests
#rm -rf ${MDANSE_APP_DIR}/Contents/Resources/mpl-data/sample_data
...
...
BuildServer/Unix/setup_ci.sh
View file @
3ee376a6
...
...
@@ -42,7 +42,7 @@ echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}"
PKG_INFO
=
${
CI_PROJECT_DIR
}
/MDANSE/__pkginfo__.py
# Update the __pkginfo__ file with the current commit
$
SED_I_COMMAND
"s/.*__commit__.*/__commit__ =
\"
${
CI_COMMIT_ID
}
\"
/"
${
PKG_INFO
}
"
${
SED_I_COMMAND
[@]
}
"
"s/.*__commit__.*/__commit__ =
\"
${
CI_COMMIT_ID
}
\"
/"
${
PKG_INFO
}
# Get MDANSE version
MDANSE_VERSION
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
${
PKG_INFO
}
`
...
...
@@ -51,16 +51,16 @@ MDANSE_VERSION=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' ${PKG_INFO}`
if
[[
${
CI_COMMIT_REF_NAME
}
==
"master"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
${
SED_I_COMMAND
}
"s/.*__beta__.*/__beta__ = None/"
${
PKG_INFO
}
"
${
SED_I_COMMAND
[@]
}
"
"s/.*__beta__.*/__beta__ = None/"
${
PKG_INFO
}
else
# Check if branch is release*
if
[[
${
CI_COMMIT_REF_NAME
::7
}
==
"release"
]]
then
VERSION_NAME
=
${
MDANSE_VERSION
}
-rc-
${
CI_COMMIT_ID
}
${
SED_I_COMMAND
}
"s/.*__beta__.*/__beta__ =
\"
rc
\"
/"
${
PKG_INFO
}
"
${
SED_I_COMMAND
[@]
}
"
"s/.*__beta__.*/__beta__ =
\"
rc
\"
/"
${
PKG_INFO
}
else
VERSION_NAME
=
${
MDANSE_VERSION
}
-beta-
${
CI_COMMIT_ID
}
${
SED_I_COMMAND
}
"s/.*__beta__.*/__beta__ =
\"
beta
\"
/"
${
PKG_INFO
}
"
${
SED_I_COMMAND
[@]
}
"
"s/.*__beta__.*/__beta__ =
\"
beta
\"
/"
${
PKG_INFO
}
fi
fi
export
VERSION_NAME
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment