From 7d9b6b30dbc5374f9fa8d4492111f445465f37d7 Mon Sep 17 00:00:00 2001 From: Elsie Date: Wed, 9 Aug 2023 18:18:16 -0500 Subject: [PATCH 1/3] fix(unicorn-{mobile,desktop}-git): include bashrc --- packages/unicorn-desktop-git/unicorn-desktop-git.pacscript | 1 + packages/unicorn-mobile-git/unicorn-mobile-git.pacscript | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript index a346410e56..3849cf028b 100644 --- a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript +++ b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript @@ -36,6 +36,7 @@ package() { for i in xfce4 plank autostart ulauncher; do sudo cp -r "${i}" "${pkgdir}/etc/skel/.config" done + sudo install -Dm644 ".bashrc" -t "${pkgdir}/etc/skel" sudo install -Dm755 "startunicorn" -t "${pkgdir}/usr/bin" sudo install -Dm755 "unicorn-session" -t "${pkgdir}/usr/bin" sudo install -Dm755 ".xinitrc" -t "${pkgdir}/etc/xdg/xdg-unicorn" diff --git a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript index 9be634c9f8..d4c9ffaad2 100644 --- a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript +++ b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript @@ -45,6 +45,7 @@ package() { for i in xfce4 plank autostart ulauncher; do sudo cp -r "${i}" "${pkgdir}/etc/skel/.config" done + sudo install -Dm644 ".bashrc" -t "${pkgdir}/etc/skel" sudo install -Dm755 "startunicorn" -t "${pkgdir}/usr/bin" sudo install -Dm755 "unicorn-session" -t "${pkgdir}/usr/bin" sudo install -Dm755 ".xinitrc" -t "${pkgdir}/etc/xdg/xdg-unicorn" From 561593bf74ed03527d4edbf5c5fe70e63b2bb2fd Mon Sep 17 00:00:00 2001 From: Elsie Date: Thu, 10 Aug 2023 09:35:34 -0500 Subject: [PATCH 2/3] Append tie --- .../unicorn-desktop-git/unicorn-desktop-git.pacscript | 8 +++++++- packages/unicorn-mobile-git/unicorn-mobile-git.pacscript | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript index 3849cf028b..e9cbfcdd96 100644 --- a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript +++ b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript @@ -36,7 +36,6 @@ package() { for i in xfce4 plank autostart ulauncher; do sudo cp -r "${i}" "${pkgdir}/etc/skel/.config" done - sudo install -Dm644 ".bashrc" -t "${pkgdir}/etc/skel" sudo install -Dm755 "startunicorn" -t "${pkgdir}/usr/bin" sudo install -Dm755 "unicorn-session" -t "${pkgdir}/usr/bin" sudo install -Dm755 ".xinitrc" -t "${pkgdir}/etc/xdg/xdg-unicorn" @@ -70,4 +69,11 @@ post_install() { fi cp /etc/skel/.lightpad/* "${homedir}/.lightpad" papirus-folders -C violet --theme Papirus-Dark + if ! grep -Eq 'PS1=.* # Do not remove' /etc/skel/.bashrc; then + cat <<"EOF" | tee -a /etc/skel/.bashrc > /dev/null +# comment to remove the `git status` checking '*' and '+' text in the prompt +export GIT_PS1_SHOWDIRTYSTATE=1 +PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Do not remove +EOF + fi } diff --git a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript index d4c9ffaad2..557a981cf0 100644 --- a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript +++ b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript @@ -45,7 +45,6 @@ package() { for i in xfce4 plank autostart ulauncher; do sudo cp -r "${i}" "${pkgdir}/etc/skel/.config" done - sudo install -Dm644 ".bashrc" -t "${pkgdir}/etc/skel" sudo install -Dm755 "startunicorn" -t "${pkgdir}/usr/bin" sudo install -Dm755 "unicorn-session" -t "${pkgdir}/usr/bin" sudo install -Dm755 ".xinitrc" -t "${pkgdir}/etc/xdg/xdg-unicorn" @@ -86,4 +85,11 @@ post_install() { mkdir -p "${homedir}/.local/share" fi cp -r "/etc/skel/.local/share/onboard" "${homedir}/.local/share" + if ! grep -Eq 'PS1=.* # Do not remove' /etc/skel/.bashrc; then + cat <<"EOF" | tee -a /etc/skel/.bashrc > /dev/null +# comment to remove the `git status` checking '*' and '+' text in the prompt +export GIT_PS1_SHOWDIRTYSTATE=1 +PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Do not remove +EOF + fi } From f328c395c14c5d783415c2cdf351755ad8ad1863 Mon Sep 17 00:00:00 2001 From: Elsie Date: Thu, 10 Aug 2023 10:01:57 -0500 Subject: [PATCH 3/3] Easier message --- packages/unicorn-desktop-git/unicorn-desktop-git.pacscript | 4 ++-- packages/unicorn-mobile-git/unicorn-mobile-git.pacscript | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript index e9cbfcdd96..319779d827 100644 --- a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript +++ b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript @@ -69,11 +69,11 @@ post_install() { fi cp /etc/skel/.lightpad/* "${homedir}/.lightpad" papirus-folders -C violet --theme Papirus-Dark - if ! grep -Eq 'PS1=.* # Do not remove' /etc/skel/.bashrc; then + if ! grep -Eq 'PS1=.* # Rhino' /etc/skel/.bashrc; then cat <<"EOF" | tee -a /etc/skel/.bashrc > /dev/null # comment to remove the `git status` checking '*' and '+' text in the prompt export GIT_PS1_SHOWDIRTYSTATE=1 -PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Do not remove +PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Rhino EOF fi } diff --git a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript index 557a981cf0..79c9f1e300 100644 --- a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript +++ b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript @@ -85,11 +85,11 @@ post_install() { mkdir -p "${homedir}/.local/share" fi cp -r "/etc/skel/.local/share/onboard" "${homedir}/.local/share" - if ! grep -Eq 'PS1=.* # Do not remove' /etc/skel/.bashrc; then + if ! grep -Eq 'PS1=.* # Rhino' /etc/skel/.bashrc; then cat <<"EOF" | tee -a /etc/skel/.bashrc > /dev/null # comment to remove the `git status` checking '*' and '+' text in the prompt export GIT_PS1_SHOWDIRTYSTATE=1 -PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Do not remove +PS1='$(__git_ps1 "(%s) ")\[\e[1m\][\[\e[38;5;82m\]\w\[\e[39m\]] \[\e[38;5;219m\]\u\[\e[38;5;231m\]@\[\e[38;5;199m\]\h \[\e[38;5;255m\]\$ \[\e[0m\]' # Rhino EOF fi }