Skip to content

Commit

Permalink
Merge pull request #38 from vroncevic/dev
Browse files Browse the repository at this point in the history
sync
  • Loading branch information
vroncevic committed Feb 16, 2024
2 parents ac2a6ea + c8c6d4f commit 6cdd251
Show file tree
Hide file tree
Showing 30 changed files with 172 additions and 149 deletions.
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ COPY user_defined_git_functions /root/.user_defined_git_functions
COPY user_defined_doc_functions /root/.user_defined_doc_functions
COPY user_defined_rust_functions /root/.user_defined_rust_functions
COPY bash_aliases /root/.bash_aliases
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
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ cp user_defined_web_functions /home/${USERNAME}/.user_defined_web_function
cp user_defined_git_functions /home/${USERNAME}/.user_defined_git_functions
cp user_defined_doc_functions /home/${USERNAME}/.user_defined_doc_functions
cp user_defined_rust_functions /home/${USERNAME}/.user_defined_rust_functions
cp user_defined_yocto_functions /home/${USERNAME}/.user_defined_yocto_functions
cp bash_aliases /home/${USERNAME}/.bash_aliases
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
Expand All @@ -71,9 +70,8 @@ cp user_defined_web_functions /root/.user_defined_web_functions
cp user_defined_git_functions /root/.user_defined_git_functions
cp user_defined_doc_functions /root/.user_defined_doc_functions
cp user_defined_rust_functions /root/.user_defined_rust_functions
cp user_defined_yocto_functions /root/.user_defined_yocto_functions
cp bash_aliases /root/.bash_aliases
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
Expand Down
12 changes: 8 additions & 4 deletions bash_aliases
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# @brief User-defined aliases
# @version ver.1.9.6
# @version ver.2.0.6
# @date Sun 13 Feb 2022 10:52:42 AM CET
# @company None, free software to use 2022
# @company None, free software to use 2024
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
#

Expand All @@ -20,7 +20,6 @@ if [ ${EUID} -eq 0 ]; then
. /root/.user_defined_file_functions
. /root/.user_defined_hw_functions
. /root/.user_defined_net_functions
. /root/.user_defined_rs_functions
. /root/.user_defined_py_functions
. /root/.user_defined_perl_functions
. /root/.user_defined_java_functions
Expand All @@ -29,13 +28,13 @@ if [ ${EUID} -eq 0 ]; then
. /root/.user_defined_git_functions
. /root/.user_defined_doc_functions
. /root/.user_defined_rust_functions
. /root/.user_defined_yocto_functions
else
. /home/${USER}/.user_defined_functions
. /home/${USER}/.user_defined_str_functions
. /home/${USER}/.user_defined_file_functions
. /home/${USER}/.user_defined_hw_functions
. /home/${USER}/.user_defined_net_functions
. /home/${USER}/.user_defined_rs_functions
. /home/${USER}/.user_defined_py_functions
. /home/${USER}/.user_defined_perl_functions
. /home/${USER}/.user_defined_java_functions
Expand All @@ -44,6 +43,7 @@ else
. /home/${USER}/.user_defined_git_functions
. /home/${USER}/.user_defined_doc_functions
. /home/${USER}/.user_defined_rust_functions
. /home/${USER}/.user_defined_yocto_functions
fi

# Global aliasses
Expand Down Expand Up @@ -148,6 +148,10 @@ alias check_big_changes="__check_big_changes"
alias remove_big_file="__remove_big_file $1"
alias ref_tag="__ref_tag"

# Yocto aliases
alias yocto_heler="__yocto_helper"
alias package_info="__package_info $1"

# Doc aliases
alias doc_helper="__doc_helper"
alias sphinx_create="__sphinx_create"
Expand Down
19 changes: 0 additions & 19 deletions bash_login

This file was deleted.

15 changes: 0 additions & 15 deletions bash_logout

This file was deleted.

4 changes: 2 additions & 2 deletions bash_profile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# @brief Setup PATH and bash profile
# @version ver.1.9.6
# @version ver.2.0.6
# @date Sun 13 Feb 2022 10:52:42 AM CET
# @company None, free software to use 2022
# @company None, free software to use 2024
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
#

Expand Down
8 changes: 4 additions & 4 deletions bashrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# @brief Bash rc
# @version ver.1.9.6
# @version ver.2.0.6
# @date Sun 13 Feb 2022 10:52:42 AM CET
# @company None, free software to use 2022
# @company None, free software to use 2024
# @author Vladimir Roncevic <elektron.ronca@gmail.com>
#

Expand Down Expand Up @@ -101,6 +101,6 @@ if [ -d "/opt/pico/pico-sdk/" ]; then
fi

# set risc-v env
if [ -d "/opt/MRS_Toolchain_Linux_x64_V1.90" ]; then
PATH="${PATH}:/opt/MRS_Toolchain_Linux_x64_V1.90/RISC-V_Embedded_GCC/bin"
if [ -d "/opt/mrs_toolchain_v1.90" ]; then
PATH="${PATH}:/opt/mrs_toolchain_v1.90/risc_v_embedded_gcc12/bin"
fi
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/doctrees/index.doctree
Binary file not shown.
47 changes: 25 additions & 22 deletions docs/build/html/_sources/index.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ To install **bash_env**, type the following
cp user_defined_git_functions /home/${USERNAME}/.user_defined_git_functions
cp user_defined_doc_functions /home/${USERNAME}/.user_defined_doc_functions
cp user_defined_rust_functions /home/${USERNAME}/.user_defined_rust_functions
cp user_defined_yocto_functions /home/${USERNAME}/.user_defined_yocto_functions
cp bash_aliases /home/${USERNAME}/.bash_aliases
cp bash_logout /home/${USERNAME}/.bash_logout
cp bash_login /home/${USERNAME}/.bash_login
Expand All @@ -81,6 +82,7 @@ To install **bash_env**, type the following
cp user_defined_git_functions /root/.user_defined_git_functions
cp user_defined_doc_functions /root/.user_defined_doc_functions
cp user_defined_rust_functions /root/.user_defined_rust_functions
cp user_defined_yocto_functions /root/.user_defined_yocto_functions
cp bash_aliases /root/.bash_aliases
cp bash_logout /root/.bash_logout
cp bash_login /root/.bash_login
Expand Down Expand Up @@ -130,28 +132,29 @@ Configuration files

.. code-block:: bash
.user_defined_functions
.user_defined_str_functions
.user_defined_file_functions
.user_defined_hw_functions
.user_defined_net_functions
.user_defined_py_functions
.user_defined_perl_functions
.user_defined_java_functions
.user_defined_embedded_functions
.user_defined_web_functions
.user_defined_git_functions
.user_defined_doc_functions
.user_defined_rust_functions
.bash_aliases
.bash_logout
.bash_login
.bashrc
.profile
.bash_profile
.emacs
.emacs.d/lisp/fill-column-indicator.el
.gitconfig
user_defined_functions
user_defined_str_functions
user_defined_file_functions
user_defined_hw_functions
user_defined_net_functions
user_defined_py_functions
user_defined_perl_functions
user_defined_java_functions
user_defined_embedded_functions
user_defined_web_functions
user_defined_git_functions
user_defined_doc_functions
user_defined_rust_functions
user_defined_yocto_functions
bash_aliases
bash_logout
bash_login
bashrc
profile
bash_profile
emacs
emacs.d/lisp/fill-column-indicator.el
gitconfig
Copyright and licence
----------------------
Expand Down
47 changes: 25 additions & 22 deletions docs/build/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
cp<span class="w"> </span>user_defined_git_functions<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.user_defined_git_functions
cp<span class="w"> </span>user_defined_doc_functions<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.user_defined_doc_functions
cp<span class="w"> </span>user_defined_rust_functions<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.user_defined_rust_functions
cp<span class="w"> </span>user_defined_yocto_functions<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.user_defined_yocto_functions
cp<span class="w"> </span>bash_aliases<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bash_aliases
cp<span class="w"> </span>bash_logout<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bash_logout
cp<span class="w"> </span>bash_login<span class="w"> </span>/home/<span class="si">${</span><span class="nv">USERNAME</span><span class="si">}</span>/.bash_login
Expand All @@ -92,6 +93,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
cp<span class="w"> </span>user_defined_git_functions<span class="w"> </span>/root/.user_defined_git_functions
cp<span class="w"> </span>user_defined_doc_functions<span class="w"> </span>/root/.user_defined_doc_functions
cp<span class="w"> </span>user_defined_rust_functions<span class="w"> </span>/root/.user_defined_rust_functions
cp<span class="w"> </span>user_defined_yocto_functions<span class="w"> </span>/root/.user_defined_yocto_functions
cp<span class="w"> </span>bash_aliases<span class="w"> </span>/root/.bash_aliases
cp<span class="w"> </span>bash_logout<span class="w"> </span>/root/.bash_logout
cp<span class="w"> </span>bash_login<span class="w"> </span>/root/.bash_login
Expand Down Expand Up @@ -133,28 +135,29 @@ <h1>Dependencies<a class="headerlink" href="#dependencies" title="Permalink to t
<h1>Set of modules<a class="headerlink" href="#set-of-modules" title="Permalink to this heading"></a></h1>
<p><strong>bash_env</strong> is based on Bash and Lisp modules.</p>
<p>Configuration files</p>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.user_defined_functions
.user_defined_str_functions
.user_defined_file_functions
.user_defined_hw_functions
.user_defined_net_functions
.user_defined_py_functions
.user_defined_perl_functions
.user_defined_java_functions
.user_defined_embedded_functions
.user_defined_web_functions
.user_defined_git_functions
.user_defined_doc_functions
.user_defined_rust_functions
.bash_aliases
.bash_logout
.bash_login
.bashrc
.profile
.bash_profile
.emacs
.emacs.d/lisp/fill-column-indicator.el
.gitconfig
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>user_defined_functions
user_defined_str_functions
user_defined_file_functions
user_defined_hw_functions
user_defined_net_functions
user_defined_py_functions
user_defined_perl_functions
user_defined_java_functions
user_defined_embedded_functions
user_defined_web_functions
user_defined_git_functions
user_defined_doc_functions
user_defined_rust_functions
user_defined_yocto_functions
bash_aliases
bash_logout
bash_login
bashrc
profile
bash_profile
emacs
emacs.d/lisp/fill-column-indicator.el
gitconfig
</pre></div>
</div>
</section>
Expand Down
Binary file modified docs/build/html/objects.inv
Binary file not shown.
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.

5 changes: 2 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@

import os
import sys

from typing import Any, List, Dict, Tuple
from typing import Any, Dict, List, Tuple

sys.path.insert(0, os.path.abspath('../../'))

project: str = 'bash_env'
project_copyright: str = '2024, https://vroncevic.github.io/bash_env'
author: str = 'Vladimir Roncevic <elektron.ronca@gmail.com>'
version: str = '1.9.6'
version: str = '2.0.6'
release: str = 'https://github.com/vroncevic/bash_env/releases'
extensions: List[str] = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', ]
templates_path: List[str] = ['_templates']
Expand Down

0 comments on commit 6cdd251

Please sign in to comment.