Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a list of BASH shell aliases and merge them with ohmyZSH aliases #6840

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add a list of BASH shell aliases and merge them with ohmyZSH aliases #6840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/functions/compilation/packages/armbian-zsh-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ compile_armbian-zsh() {
# define default plugins
sed -i 's/^plugins=.*/plugins=(evalcache git git-extras debian tmux screen history extract colorize web-search docker)/' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc

# add collection of Armbian BASH aliases also to ZSH. They are compatible
cat "${SRC}"/packages/bsp/common/etc/skel/.bash_aliases >> "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc

chmod 755 "${tmp_dir}/${armbian_zsh_dir}"/DEBIAN/postinst

dpkg_deb_build "${tmp_dir}/${armbian_zsh_dir}" "armbian-zsh"
Expand Down
14 changes: 6 additions & 8 deletions lib/functions/rootfs/distro-agnostic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,14 @@ function install_distribution_agnostic() {
echo -e "${VENDOR} ${IMAGE_VERSION:-"${REVISION}"} ${RELEASE^} \\l \n" > "${SDCARD}"/etc/issue
echo "${VENDOR} ${IMAGE_VERSION:-"${REVISION}"} ${RELEASE^}" > "${SDCARD}"/etc/issue.net

# PRETTY_NAME changing in os-release is now done in armbian-base-files directly.
# Copy SKEL bashrc and profile to root user
cp "${SDCARD}"/etc/skel/.bashrc "${SDCARD}"/root/
cp "${SDCARD}"/etc/skel/.profile "${SDCARD}"/root/

# enable few bash aliases enabled in Ubuntu by default to make it even
sed "s/#alias ll='ls -l'/alias ll='ls -l'/" -i "${SDCARD}"/etc/skel/.bashrc
sed "s/#alias la='ls -A'/alias la='ls -A'/" -i "${SDCARD}"/etc/skel/.bashrc
sed "s/#alias l='ls -CF'/alias l='ls -CF'/" -i "${SDCARD}"/etc/skel/.bashrc
# root user is already there. Copy bashrc there as well
cp "${SDCARD}"/etc/skel/.bashrc "${SDCARD}"/root
# Copy systemwide alieases to root user too
cp "${SRC}"/packages/bsp/common/etc/skel/.bash_aliases "${SDCARD}"/root/

# display welcome message at first root login @TODO: what reads this?
# display welcome message at first root login which is ready by /usr/sbin/armbian/armbian-firstlogin
touch "${SDCARD}"/root/.not_logged_in_yet

if [[ ${DESKTOP_AUTOLOGIN} == yes ]]; then
Expand Down
6 changes: 6 additions & 0 deletions packages/bsp/common/etc/skel/.bash_aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# BASH or ZSH shell alieases
alias ll='ls -l'
alias la='ls -A'
alias l='ls -CF'
alias kernel="uname -r | sed 's/[1-9]\+[0-9]*\.[0-9]\+\.[0-9]\+-//' | sed 's/[1-9]\+[0-9]*\.[0-9]*\-rc[0-9]\+-//'"
alias showip='ip -4 addr show scope global | grep inet | awk "{print $2}" | cut -d"/" -f1 | sed "s/ inet //g" | paste -s -d, -'