Skip to content

Commit

Permalink
Merge pull request #25 from vroncevic/dev
Browse files Browse the repository at this point in the history
[bash_env] added bash_profile to fix issue with implicit source bash session, updated Dockerfile, docs
  • Loading branch information
vroncevic committed Dec 8, 2021
2 parents 31c3b63 + 101ac10 commit 0dffc6c
Show file tree
Hide file tree
Showing 32 changed files with 183 additions and 46 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
emacs \
dos2unix \
vim \
nano \
espeak

COPY user_defined_functions /root/.user_defined_functions
Expand All @@ -41,6 +42,7 @@ COPY bash_logout /root/.bash_logout
COPY bash_login /root/.bash_login
COPY bashrc /root/.bashrc
COPY profile /root/.profile
COPY bash_profile /root/.bash_profile
COPY emacs /root/.emacs
COPY fill-column-indicator.el /root/.emacs.d/lisp/
RUN tree /root/
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ cp bash_logout /home/${USERNAME}/.bash_logout
cp bash_login /home/${USERNAME}/.bash_login
cp bashrc /home/${USERNAME}/.bashrc
cp profile /home/${USERNAME}/.profile
cp bash_profile /home/${USERNAME}/.bash_profile
cp emacs /home/${USERNAME}/.emacs
cp fill-column-indicator.el /home/${USERNAME}/.emacs.d/lisp/
Expand All @@ -72,10 +73,31 @@ cp bash_logout /root/.bash_logout
cp bash_login /root/.bash_login
cp bashrc /root/.bashrc
cp profile /root/.profile
cp bash_profile /root/.bash_profile
cp emacs /root/.emacs
cp fill-column-indicator.el /root/.emacs.d/lisp/
```

Updated default locale
```
vi /etc/default/locale
```

Modify configuraiion to
```
LANG="en_US.UTF-8"
LANGUAGE="en_US:en"
LC_NUMERIC="en_US.UTF-8"
LC_TIME="en_US.UTF-8"
LC_MONETARY="en_US.UTF-8"
LC_PAPER="en_US.UTF-8"
LC_IDENTIFICATION="en_US.UTF-8"
LC_NAME="en_US.UTF-8"
LC_ADDRESS="en_US.UTF-8"
LC_TELEPHONE="en_US.UTF-8"
LC_MEASUREMENT="en_US.UTF-8"
```

Or You can use docker to create image/container.

[![bash_env docker checker](https://github.com/vroncevic/bash_env/workflows/bash_env%20docker%20checker/badge.svg)](https://github.com/vroncevic/bash_env/actions?query=workflow%3A%22bash_env+docker+checker%22)
Expand Down
2 changes: 1 addition & 1 deletion bash_aliases
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# @brief User defined aliases
# @version ver.1.4.3
# @version ver.1.4.4
# @date Sun 21 Nov 2021 04:36:00 PM CET
# @company None, free software to use 2021
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion bash_login
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# @brief User defined embedded functions
# @version ver.1.4.3
# @version ver.1.4.4
# @date Sun 21 Nov 2021 04:36:00 PM CET
# @company None, free software to use 2021
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion bash_logout
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# @brief User defined embedded functions
# @version ver.1.4.3
# @version ver.1.4.4
# @date Sun 21 Nov 2021 04:36:00 PM CET
# @company None, free software to use 2021
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
Expand Down
23 changes: 23 additions & 0 deletions bash_profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# @brief Setup PATH and bash profile
# @version ver.1.4.4
# @date Sun 21 Nov 2021 04:36:00 PM CET
# @company None, free software to use 2021
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
#

# source bashrc
if [[ "$EUID" -ne 0 ]]; then
if [[ -f ~/.bashrc ]]; then
. ~/.bashrc
fi
else
if [ -f "/root/.bashrc" ]; then
. /root/.bashrc
fi
fi

# set PATH so it includes user's private bin if it exists
if [ -d "/root/bin/" ]; then
PATH=${PATH}:/root/bin/
fi
2 changes: 1 addition & 1 deletion bashrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# @brief Bash rc
# @version ver.1.4.3
# @version ver.1.4.4
# @date Sun 21 Nov 2021 04:36:00 PM CET
# @company None, free software to use 2021
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
Expand Down
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/doctrees/index.doctree
Binary file not shown.
30 changes: 30 additions & 0 deletions docs/build/html/_sources/index.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ other information that should be provided before the tool is installed.
Installation
-------------

|Debian Linux OS|

.. |Debian Linux OS| image:: https://raw.githubusercontent.com/vroncevic/bash_env/dev/docs/debtux.png
:target: https://www.debian.org

Navigate to release `page`_ download and extract release archive.

.. _page: https://github.com/vroncevic/bash_env/releases
Expand Down Expand Up @@ -61,6 +66,7 @@ To install **bash_env** type the following
cp bash_login /home/${USERNAME}/.bash_login
cp bashrc /home/${USERNAME}/.bashrc
cp profile /home/${USERNAME}/.profile
cp bash_profile /home/${USERNAME}/.bash_profile
cp emacs /home/${USERNAME}/.emacs
cp fill-column-indicator.el /home/${USERNAME}/.emacs.d/lisp/
Expand All @@ -82,9 +88,32 @@ To install **bash_env** type the following
cp bash_login /root/.bash_login
cp bashrc /root/.bashrc
cp profile /root/.profile
cp bash_profile /root/.bash_profile
cp emacs /root/.emacs
cp fill-column-indicator.el /root/.emacs.d/lisp/
Updated default locale

.. code-block:: bash
Updated default locale
Modify configuraiion to

.. code-block:: bash
LANG="en_US.UTF-8"
LANGUAGE="en_US:en"
LC_NUMERIC="en_US.UTF-8"
LC_TIME="en_US.UTF-8"
LC_MONETARY="en_US.UTF-8"
LC_PAPER="en_US.UTF-8"
LC_IDENTIFICATION="en_US.UTF-8"
LC_NAME="en_US.UTF-8"
LC_ADDRESS="en_US.UTF-8"
LC_TELEPHONE="en_US.UTF-8"
LC_MEASUREMENT="en_US.UTF-8"
Or You can use Docker to create image/container.

|GitHub docker checker|
Expand Down Expand Up @@ -125,6 +154,7 @@ Configuration files
.bash_login
.bashrc
.profile
.bash_profile
.emacs
.emacs.d/lisp/fill-column-indicator.el
Expand Down
3 changes: 2 additions & 1 deletion docs/build/html/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,9 @@ dl.glossary dt {

.classifier:before {
font-style: normal;
margin: 0.5em;
margin: 0 0.5em;
content: ":";
display: inline-block;
}

abbr, acronym {
Expand Down
5 changes: 3 additions & 2 deletions docs/build/html/_static/searchtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@ var Search = {
var results = [];

for (var prefix in objects) {
for (var name in objects[prefix]) {
for (var iMatch = 0; iMatch != objects[prefix].length; ++iMatch) {
var match = objects[prefix][iMatch];
var name = match[4];
var fullname = (prefix ? prefix + '.' : '') + name;
var fullnameLower = fullname.toLowerCase()
if (fullnameLower.indexOf(object) > -1) {
Expand All @@ -342,7 +344,6 @@ var Search = {
} else if (parts[parts.length - 1].indexOf(object) > -1) {
score += Scorer.objPartialMatch;
}
var match = objects[prefix][name];
var objname = objnames[match[1]][2];
var title = titles[match[0]];
// If more than one term searched for, we require other words to be
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<a href="index.html" class="icon icon-home"> bash_env
</a>
<div class="version">
1.3.3
1.4.4
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
Expand Down
51 changes: 37 additions & 14 deletions docs/build/html/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
<meta charset="utf-8" />
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>bash_env (Linux BASH/Emacs Environment files) &mdash; bash_env https://github.com/vroncevic/bash_env/releases documentation</title>
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
Expand All @@ -27,7 +28,7 @@
<a href="#" class="icon icon-home"> bash_env
</a>
<div class="version">
1.3.3
1.4.4
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
Expand Down Expand Up @@ -65,7 +66,7 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">

<div class="section" id="bash-env-linux-bash-emacs-environment-files">
<section id="bash-env-linux-bash-emacs-environment-files">
<h1>bash_env (Linux BASH/Emacs Environment files)<a class="headerlink" href="#bash-env-linux-bash-emacs-environment-files" title="Permalink to this headline"></a></h1>
<p>Linux BASH/Emacs Environment configuration files.</p>
<p>Developed in <a class="reference external" href="https://en.wikipedia.org/wiki/Bash_(Unix_shell)">bash</a>, <a class="reference external" href="https://en.wikipedia.org/wiki/Lisp_(programming_language">lisp</a>.</p>
Expand All @@ -76,9 +77,10 @@ <h1>bash_env (Linux BASH/Emacs Environment files)<a class="headerlink" href="#ba
<p><a class="reference external" href="https://github.com/vroncevic/bash_env/issues"><img alt="GitHub issues" src="https://img.shields.io/github/issues/vroncevic/bash_env.svg" /></a> <a class="reference external" href="https://bash_env.readthedocs.io/projects/bash_env/en/latest/?badge=latest"><img alt="Documentation Status" src="https://readthedocs.org/projects/bash_env/badge/?version=latest" /></a> <a class="reference external" href="https://github.com/vroncevic/bash_env/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/vroncevic/bash_env.svg" /></a></p>
<div class="toctree-wrapper compound">
</div>
</div>
<div class="section" id="installation">
</section>
<section id="installation">
<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline"></a></h1>
<p><a class="reference external" href="https://www.debian.org"><img alt="Debian Linux OS" src="https://raw.githubusercontent.com/vroncevic/bash_env/dev/docs/debtux.png" /></a></p>
<p>Navigate to release <a class="reference external" href="https://github.com/vroncevic/bash_env/releases">page</a> download and extract release archive.</p>
<p>To install <strong>bash_env</strong> type the following</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>tar xvzf bash_env-x.y.z.tar.gz
Expand All @@ -101,6 +103,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
cp bash_login /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bash_login
cp bashrc /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bashrc
cp profile /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.profile
cp bash_profile /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bash_profile
cp emacs /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.emacs
cp fill-column-indicator.el /home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.emacs.d/lisp/

Expand All @@ -122,21 +125,40 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
cp bash_login /root/.bash_login
cp bashrc /root/.bashrc
cp profile /root/.profile
cp bash_profile /root/.bash_profile
cp emacs /root/.emacs
cp fill-column-indicator.el /root/.emacs.d/lisp/
</pre></div>
</div>
<p>Updated default locale</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>Updated default locale
</pre></div>
</div>
<p>Modify configuraiion to</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nv">LANG</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LANGUAGE</span><span class="o">=</span><span class="s2">&quot;en_US:en&quot;</span>
<span class="nv">LC_NUMERIC</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_TIME</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_MONETARY</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_PAPER</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_IDENTIFICATION</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_NAME</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_ADDRESS</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_TELEPHONE</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
<span class="nv">LC_MEASUREMENT</span><span class="o">=</span><span class="s2">&quot;en_US.UTF-8&quot;</span>
</pre></div>
</div>
<p>Or You can use Docker to create image/container.</p>
<p><a class="reference external" href="https://github.com/vroncevic/bash_env/actions?query=workflow%3A%22bash_env+docker+checker%22"><img alt="GitHub docker checker" src="https://github.com/vroncevic/bash_env/workflows/bash_env%20docker%20checker/badge.svg" /></a></p>
</div>
<div class="section" id="dependencies">
</section>
<section id="dependencies">
<h1>Dependencies<a class="headerlink" href="#dependencies" title="Permalink to this headline"></a></h1>
<p><strong>bash_env</strong> requires next modules and libraries</p>
<ul class="simple">
<li><p>None</p></li>
</ul>
</div>
<div class="section" id="set-of-modules">
</section>
<section id="set-of-modules">
<h1>Set of modules<a class="headerlink" href="#set-of-modules" title="Permalink to this headline"></a></h1>
<p><strong>bash_env</strong> is based on bash and lisp modules.</p>
<p>Configuration files</p>
Expand All @@ -157,12 +179,13 @@ <h1>Set of modules<a class="headerlink" href="#set-of-modules" title="Permalink
.bash_login
.bashrc
.profile
.bash_profile
.emacs
.emacs.d/lisp/fill-column-indicator.el
</pre></div>
</div>
</div>
<div class="section" id="copyright-and-licence">
</section>
<section id="copyright-and-licence">
<h1>Copyright and licence<a class="headerlink" href="#copyright-and-licence" title="Permalink to this headline"></a></h1>
<p><a class="reference external" href="https://www.gnu.org/licenses/gpl-3.0"><img alt="License: GPL v3" src="https://img.shields.io/badge/License-GPLv3-blue.svg" /></a> <a class="reference external" href="https://opensource.org/licenses/Apache-2.0"><img alt="License: Apache 2.0" src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a></p>
<p>Copyright (C) 2018 by <a class="reference external" href="https://vroncevic.github.io/bash_env">vroncevic.github.io/bash_env</a></p>
Expand All @@ -172,15 +195,15 @@ <h1>Copyright and licence<a class="headerlink" href="#copyright-and-licence" tit
<p>Lets help and support FSF.</p>
<p><a class="reference external" href="https://my.fsf.org/"><img alt="Free Software Foundation" src="https://raw.githubusercontent.com/vroncevic/bash_env/dev/docs/fsf-logo_1.png" /></a></p>
<p><a class="reference external" href="https://my.fsf.org/donate/"><img alt="Donate" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" /></a></p>
</div>
<div class="section" id="indices-and-tables">
</section>
<section id="indices-and-tables">
<h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline"></a></h1>
<ul class="simple">
<li><p><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></p></li>
<li><p><a class="reference internal" href="py-modindex.html"><span class="std std-ref">Module Index</span></a></p></li>
<li><p><a class="reference internal" href="search.html"><span class="std std-ref">Search Page</span></a></p></li>
</ul>
</div>
</section>


</div>
Expand Down
Binary file modified docs/build/html/objects.inv
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<a href="index.html" class="icon icon-home"> bash_env
</a>
<div class="version">
1.3.3
1.4.4
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="#" method="get">
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/searchindex.js

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

2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
project = u'bash_env'
copyright = u'2020, Vladimir Roncevic <elektron.ronca@gmail.com>'
author = u'Vladimir Roncevic <elektron.ronca@gmail.com>'
version = u'1.3.3'
version = u'1.4.4'
release = u'https://github.com/vroncevic/bash_env/releases'
extensions = []
templates_path = ['_templates']
Expand Down

0 comments on commit 0dffc6c

Please sign in to comment.