Skip to content

Commit

Permalink
Merge pull request #212 from BenediktMKuehne/pipdev
Browse files Browse the repository at this point in the history
Pipdev
  • Loading branch information
m-1-k-3 authored Jul 15, 2024
2 parents 7a039fc + 2ecbb3b commit c4c154e
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 10 deletions.
18 changes: 9 additions & 9 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1-02a5f8d9
0.1-3040c41a
30 changes: 30 additions & 0 deletions dev-tools/update_pipenv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# EMBArk - The firmware security scanning environment
#
# Copyright 2024 Siemens Energy AG
#
# EMBArk comes with ABSOLUTELY NO WARRANTY.
#
# EMBArk is licensed under MIT
#
# Author(s): Benedikt Kuehne

# Description: Automates updating the pipfile

# 1. find out which installation
INSTALL=""

INSTALL="deploy"

if grep -q "EMBARK_INSTALL=dev" ./.env ; then
INSTALL="dev"
fi

# 2. update pipfile
if [[ "${INSTALL}" == "dev" ]]; then
MYSQLCLIENT_LDFLAGS='-L/usr/mysql/lib -lmysqlclient -lssl -lcrypto -lresolv' MYSQLCLIENT_CFLAGS='-I/usr/include/mysql/' PIPENV_VENV_IN_PROJECT=1 pipenv update --dev
else
echo "This is not a developer setup...still trying to update"
MYSQLCLIENT_LDFLAGS='-L/usr/mysql/lib -lmysqlclient -lssl -lcrypto -lresolv' MYSQLCLIENT_CFLAGS='-I/usr/include/mysql/' PIPENV_VENV_IN_PROJECT=1 pipenv update
fi
# push to web-dir if available
2 changes: 2 additions & 0 deletions installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ install_embark_default(){

# write env-vars into ./.env
write_env
echo "EMBARK_INSTALL=deploy" >> ./.env

if [[ "${WSL}" -eq 1 ]]; then
check_docker_wsl
Expand Down Expand Up @@ -468,6 +469,7 @@ install_embark_dev(){

# write env-vars into ./.env
write_env
echo "EMBARK_INSTALL=dev" >> ./.env
chmod 644 .env

# download images for container
Expand Down

0 comments on commit c4c154e

Please sign in to comment.