[base-layout] Version 2.0.4

- Update /etc/profile with improved prompt and to set TERM - Move from core group to base group Related to #166
jhuntwork · Sep 5, 2021 · d99f615 · d99f615
1 parent 57edf38
commit d99f615
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 43 deletions.
diff --git a/packages/base-layout/ChangeLog b/packages/base-layout/ChangeLog
@@ -1,77 +1,67 @@
-2021-08-24  Jeremy Huntwork <jeremy@merelinux.org>
+2.0.4-1 (2021-09-05)
+
+	Update /etc/profile with improved prompt and to set TERM
+	Move from core group to base group
+
+2.0.3-1 (2021-08-24)
 
-	* 2.0.3-1 :
 	Add some missing groups required by mdev
 
-2021-08-21  Jeremy Huntwork <jeremy@merelinux.org>
+2.0.2-1 (2021-08-21)
 
-	* 2.0.2-1 :
 	Normalize permissions on /run directory
 
-2021-08-19  Jeremy Huntwork <jeremy@merelinux.org>
+2.0.1-2 (2021-08-19)
 
-	* 2.0.1-2 :
 	Building again from fixed CI scripts
 
-2021-08-19  Jeremy Huntwork <jeremy@merelinux.org>
+2.0.1-1 (2021-08-19)
 
-	* 2.0.1-1 :
 	Fix PATH for root by adding /usr/bin and /usr/sbin
 
-2021-04-08  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.9-1 (2021-04-08)
 
-	* 1.9-1 :
 	Add to new core group
 	Add /bin/sh to /etc/shells
 
-2019-08-04  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.8-3 (2019-08-04)
 
-	* 1.8-3 :
 	Upload source package
 
-2019-07-30  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.8-2 (2019-07-30)
 
-	* 1.8-2 :
 	Refactor PKGBUILD file
 
-2017-05-16 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.7-1 (2017-05-16)
 
-	* 1.7-1 :
 	Improve defaults for /etc/profile
 	Make /bin/sh the default shell for root
 
-2016-10-10 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.6-1 (2016-10-10)
 
-	* 1.6-1 :
 	Remove coloring from /etc/profile
 
-2016-10-03 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.5-1 (2016-10-03)
 
-	* 1.5-1 :
 	Add etc/protocols and etc/services
 
-2015-03-23 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.4-1 (2015-03-23)
 
-	* 1.4-1 :
 	Remove some spurious directories. Not following the FHS anyway.
 
-2015-03-20 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.3-1 (2015-03-20)
 
-	* 1.3-1 :
 	Add /etc/shells
 
-2015-03-20 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.2-1 (2015-03-20)
 
-	* 1.2-1 :
 	Make /var/run a symlink to /run
 	Add /etc/mtab as a symlink to /proc/mounts
 
-2015-03-20 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.1-1 (2015-03-20)
 
-	* 1.1-1 :
 	Switch root's shell to /bin/mksh
 
-2012-04-24 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+1.0-1 (2012-04-24)
 
-	* 1.0-1 :
 	Initial version
diff --git a/packages/base-layout/PKGBUILD b/packages/base-layout/PKGBUILD
@@ -1,18 +1,17 @@
 #!/bin/bash
 # shellcheck disable=SC2034,SC2154
-# Maintainer: Jeremy Huntwork <jeremy@merelinux.org>
 
 pkgname=base-layout
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc='The base directory structure and a few core files for the system.'
-arch=('x86_64')
+arch=(x86_64)
 url='http://www.merelinux.org'
 license=(MIT)
-groups=(core)
+groups=(base)
 depends=()
 makedepends=()
-options=('emptydirs')
+options=(emptydirs)
 changelog=ChangeLog
 source=(
     passwd
@@ -25,7 +24,7 @@ source=(
 sha256sums=(
     e1d32f445c3a6da06f9787ec7b8d59bb789dde4ad95e12b62ece5b68f307777e
     ab1e9388edd7947b307b9812f5648f738d797117d99a91deb7e4fb2096c1926f
-    ab8b3e447db461aed2d39e64a31d327b3be440e94d1e7859b1b1637dd7717899
+    fc51d9783a4b429606e2621605ad9836d585fea60d051a7a0e8e62dd03d4bb45
     1dcc1e00d7189fa105c726b253aab416b3c0d47e432ac9958db54c7faacb9ac7
     b4d36eb75767bebb41c5fa7a35599952e1883b3d3f6332496e1561eeb4067018
     297b784a25fc59641589c6ef05dc26680e2805e9cab37a4ea3699aa072a25c2e

diff --git a/packages/base-layout/profile b/packages/base-layout/profile
@@ -2,23 +2,32 @@
 # intended to be usable by mksh and bash
 
 # Defaults
-hn=$(hostname -s)
-id=$(id -u)
-P='$'
+ps1_h=$(hostname -s)
+ps1_c='\033[38;5;74m'
+ps1_p='$'
 PATH='/usr/local/bin:/bin:/usr/bin'
 
+[ -z "$TERM" ] && TERM=linux
+[ -z "$PAGER" ] && PAGER=less
+[ -z "$EDITOR" ] && EDITOR=vi
+
 # Special cases for root
-if [ "$id" = '0' ] ; then
-    P='#'
+if [ "$(id -u)" -eq 0 ] ; then
+    ps1_p='#'
+    ps1_c='\033[38;5;202m'
     PATH='/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin'
 fi
 
 set_ps1() {
-    printf '%s | %s\n%s ' "$hn" "$PWD" "$P"
+    winsize=$(stty size)
+    export COLUMNS=${winsize##* }
+    printf '%d %s %s %b%s%b\n%s ' \
+        "$?" "$ps1_h" "$(date +%T)" "$ps1_c" "$PWD" '\033[00m' "$ps1_p"
 }
 
 PS1='$(set_ps1)'
 PS2=" > "
 
+
 # export environment variables
-export PATH
+export PATH TERM PAGER EDITOR