fix: Rename Prompt to Ptyxis (#916)

This commit is contained in:
Kyle Gospodnetich 2024-02-17 20:23:45 -08:00 committed by GitHub
parent 5a5d112567
commit 599e448358
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 72 additions and 72 deletions

View file

@ -17,7 +17,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
ARG PACKAGE_LIST="bluefin"
# GNOME VRR & Prompt
# GNOME VRR & Ptyxis
RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \
@ -30,7 +30,7 @@ RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
vte-profile \
libadwaita && \
rpm-ostree install \
prompt && \
ptyxis && \
rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
rpm-ostree override remove \
power-profiles-daemon \

View file

@ -1,2 +1,2 @@
[org/gnome/shell]
favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'org.gnome.Prompt.desktop', 'ubuntu.desktop', 'yelp.desktop']
favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'org.gnome.Ptyxis.desktop', 'ubuntu.desktop', 'yelp.desktop']

View file

@ -7,42 +7,42 @@ mkdir -p /usr/etc/containers/systemd/users
# bluefin-cli
wget --output-document="/usr/etc/containers/systemd/users/bluefin-cli.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/bluefin-cli.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/bluefin-cli.container
printf "\n\n[Install]\nWantedBy=bluefin-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-cli.container
sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container
# bluefin-dx-cli
wget --output-document="/usr/etc/containers/systemd/users/bluefin-dx-cli.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/bluefin-dx-cli.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/bluefin-dx-cli.container
printf "\n\n[Install]\nWantedBy=bluefin-dx-cli.target" >> /usr/etc/containers/systemd/users/bluefin-dx-cli.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-dx-cli.container
sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /usr/etc/containers/systemd/users/bluefin-dx-cli.container
# fedora-toolbox
wget --output-document="/usr/etc/containers/systemd/users/fedora-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/fedora-toolbox.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/fedora-toolbox.container
printf "\n\n[Install]\nWantedBy=fedora-toolbox.target" >> /usr/etc/containers/systemd/users/fedora-toolbox.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/fedora-toolbox.container
sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /usr/etc/containers/systemd/users/fedora-toolbox.container
# ubuntu-toolbox
wget --output-document="/usr/etc/containers/systemd/users/ubuntu-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/ubuntu-toolbox.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/ubuntu-toolbox.container
printf "\n\n[Install]\nWantedBy=ubuntu-toolbox.target" >> /usr/etc/containers/systemd/users/ubuntu-toolbox.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/ubuntu-toolbox.container
sed -i 's/ContainerName=ubuntu-distrobox-quadlet/ContainerName=ubuntu-toolbox/' /usr/etc/containers/systemd/users/ubuntu-toolbox.container
# wolfi-toolbox
wget --output-document="/usr/etc/containers/systemd/users/wolfi-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/wolfi-toolbox.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/wolfi-toolbox.container
printf "\n\n[Install]\nWantedBy=wolfi-toolbox.target" >> /usr/etc/containers/systemd/users/wolfi-toolbox.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/wolfi-toolbox.container
sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-toolbox/' /usr/etc/containers/systemd/users/wolfi-toolbox.container
# wolfi-dx-toolbox
wget --output-document="/usr/etc/containers/systemd/users/wolfi-dx-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
cat /usr/share/ublue-os/bluefin-cli/prompt-integration >> /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
printf "\n\n[Install]\nWantedBy=wolfi-dx-toolbox.target" >> /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-dx-toolbox/' /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container

View file

@ -184,19 +184,19 @@ nix-devbox-global:
echo 'run "devbox global run install-hook-zsh" to configure zsh shell'
echo 'run "devbox global run" to see other available configuration commands'
# Prompt terminal transparency
prompt-transparency opacity="0.95":
# Ptyxis terminal transparency
ptyxis-transparency opacity="0.95":
#!/usr/bin/env bash
set -euxo pipefail
if [[ -n "$(echo "{{ opacity }}" | grep -v '^[.0-9]*$')" ]]; then
printf "Value must be numeric: %s.\n" "{{ opacity }}"
elif [[ $(echo "0<{{ opacity }} && 1>{{ opacity }}" | bc -q) -eq 1 ]]; then
raw="$(gsettings get org.gnome.Prompt profile-uuids)"
raw="$(gsettings get org.gnome.Ptyxis profile-uuids)"
uuids="$(sed -En 's|[^0-9a-z]*||g; s|([0-9a-z]{32})|\1\n|gp' <<<${raw})"
for i in ${uuids}; do
location="org.gnome.Prompt.Profile:/org/gnome/Prompt/Profiles/${i}/"
location="org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/${i}/"
gsettings set "${location}" opacity "{{ opacity }}"; done
printf "Prompt opacity is now %s.\n" "{{ opacity }}"
printf "Ptyxis opacity is now %s.\n" "{{ opacity }}"
else
printf "Value must be between 0 and 1: %s.\n" "{{ opacity }}"
fi

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
# SCRIPT VERSION
USER_SETUP_VER=3
USER_SETUP_VER=4
USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/user-setup"
USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE)
@ -31,12 +31,12 @@ IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
# Enable NTP
timedatectl set-ntp true
# Ensure custom prompt theme is present
PROMPT_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Prompt/palettes"
PROMPT_DIR="$HOME/.local/share/org.gnome.Prompt/palettes"
mkdir -p "$PROMPT_DIR"
if [[ ! -f "$PROMPT_DIR/catppuccin-dynamic.palette" ]]; then
cp "$PROMPT_THEME_DIR/catppuccin-dynamic.palette" "$PROMPT_DIR/catppuccin-dynamic.palette"
# Ensure custom ptyxis theme is present
PTYXIS_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes"
PTYXIS_DIR="$HOME/.local/share/org.gnome.Ptyxis/palettes"
mkdir -p "$PTYXIS_DIR"
if [[ ! -f "$PTYXIS_DIR/catppuccin-dynamic.palette" ]]; then
cp "$PTYXIS_THEME_DIR/catppuccin-dynamic.palette" "$PTYXIS_DIR/catppuccin-dynamic.palette"
fi
# Prevent future executions

View file

@ -1,16 +1,16 @@
#!/usr/bin/bash
if command -v /usr/bin/prompt > /dev/null; then
if command -v /usr/bin/ptyxis > /dev/null; then
if [[ -z "$@" ]]; then
/usr/bin/prompt --new-window
/usr/bin/ptyxis --new-window
else
/usr/bin/prompt -- "$@"
/usr/bin/ptyxis -- "$@"
fi
elif grep '^org\.gnome\.Prompt$' <<< $(/usr/bin/flatpak list --app --columns=application); then
elif grep '^org\.gnome\.Ptyxis$' <<< $(/usr/bin/flatpak list --app --columns=application); then
if [[ -z "$@" ]]; then
/usr/bin/flatpak run org.gnome.Prompt --new-window
/usr/bin/flatpak run org.gnome.Ptyxis --new-window
else
/usr/bin/flatpak run org.gnome.Prompt -- "$@"
/usr/bin/flatpak run org.gnome.Ptyxis -- "$@"
fi
else
/usr/bin/gnome-terminal -- "$@"

View file

@ -57,13 +57,13 @@ min-alpha=0.5
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
binding='<Control><Alt>t'
command='prompt --tab-with-profile=2871e8027773ae74d6c87a5f659bbc74'
name='Host Prompt'
command='ptyxis --tab-with-profile=2871e8027773ae74d6c87a5f659bbc74'
name='Host Ptyxis'
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
binding='<Control><Alt>u'
command='prompt --tab-with-profile=4741cb2eb3614750b79edc5c4b8c08b3'
name='Ubuntu Prompt'
command='ptyxis --tab-with-profile=4741cb2eb3614750b79edc5c4b8c08b3'
name='Ubuntu Ptyxis'
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2]
binding='<Control><Shift>Escape'
@ -72,13 +72,13 @@ name='mission-center'
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3]
binding='<Control><Alt>Return'
command="prompt --tab-with-profile=a21a910811504857bea4c96b3d937b93"
name='Bluefin Prompt'
command="ptyxis --tab-with-profile=a21a910811504857bea4c96b3d937b93"
name='Bluefin Ptyxis'
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4]
binding='<Control><Alt>f'
command="prompt --tab-with-profile=d6fe45489ed74fada5d95d715449ce7e"
name='Fedora Prompt'
command="ptyxis --tab-with-profile=d6fe45489ed74fada5d95d715449ce7e"
name='Fedora Ptyxis'
[org/gnome/settings-daemon/plugins/media-keys]
custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4/']
@ -102,7 +102,7 @@ download-updates=false
download-updates-notify=false
[com/github/stunkymonkey/nautilus-open-any-terminal]
terminal='prompt'
terminal='ptyxis'
keybindings=''
new-tab=false
flatpak='off'
@ -120,12 +120,12 @@ show-gamemode=false
hide-forcequit=true
show-pods=true
[org/gnome/Prompt]
[org/gnome/Ptyxis]
interface-style='system'
restore-session=false
restore-window-size=false
profile-uuids=['2871e8027773ae74d6c87a5f659bbc74']
default-profile-uuid='2871e8027773ae74d6c87a5f659bbc74'
[org/gnome/Prompt/Profiles/2871e8027773ae74d6c87a5f659bbc74]
[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74]
palette='catppuccin-dynamic'

View file

@ -200,7 +200,7 @@ function Build_container(){
# test -f "${HOME}/.bashrc.d/00-container.sh" && rm "${HOME}/.bashrc.d/00-container.sh"
# elif test -d "${HOME}/.bashrc.d"; then
# echo "Setting first terminal be Container for bash using ~/.bashrc.d"
# echo "Enter into container using prompt's menu after first entry"
# echo "Enter into container using ptyxis's menu after first entry"
# echo "${blue}This requires your bash shell to source files in ~/.bashrc.d/${normal}"
# test -e "${HOME}/.bashrc.d/00-container.sh" && rm "${HOME}/.bashrc.d/00-container.sh"
# cp "/usr/share/ublue-os/bluefin-cli/${2}.sh" "${HOME}/.bashrc.d/00-container.sh"

View file

@ -20,7 +20,7 @@ function get_status(){
else
bluefin_cli[1]="${red}Inactive${n}"
fi
get_default=$(dconf read /org/gnome/Prompt/default-profile-uuid)
get_default=$(dconf read /org/gnome/Ptyxis/default-profile-uuid)
if test "$get_default" = "'a21a910811504857bea4c96b3d937b93'"; then
bluefin_cli[2]="${green}Default${n}"
else
@ -32,11 +32,11 @@ function get_status(){
function default_login(){
toggle=$(Choose Default Not-Default Cancel)
if test "$toggle" = "Default"; then
echo "Setting Bluefin-CLI to default Prompt Profile"
/usr/libexec/prompt-create-profile.sh bluefin-cli default
echo "Setting Bluefin-CLI to default Ptyxis Profile"
/usr/libexec/ptyxis-create-profile.sh bluefin-cli default
elif test "$toggle" = "Not-Default"; then
echo "Setting Host back to default Prompt Profile"
/usr/libexec/prompt-create-profile.sh Host default
echo "Setting Host back to default Ptyxis Profile"
/usr/libexec/ptyxis-create-profile.sh Host default
else
dconf write /or
echo "Not Changing"
@ -64,8 +64,8 @@ function logic(){
systemctl --user reset-failed bluefin-cli.service > /dev/null 2>&1 || true
fi
fi
echo "Setting Host back to default Prompt Profile"
/usr/libexec/prompt-create-profile.sh Host default
echo "Setting Host back to default Ptyxis Profile"
/usr/libexec/ptyxis-create-profile.sh Host default
else
echo "Not Changing"
fi

View file

@ -1,7 +1,7 @@
#!/usr/bin/bash
# Read the current value of the array
CURRENT_VALUE=$(dconf read /org/gnome/Prompt/profile-uuids)
CURRENT_VALUE=$(dconf read /org/gnome/Ptyxis/profile-uuids)
guid="$1"
# remove the leading and trailing brackets
@ -29,4 +29,4 @@ UPDATED_VALUE=${UPDATED_VALUE%?}
UPDATED_VALUE="[$UPDATED_VALUE]"
# Write the updated array back to dconf
dconf write /org/gnome/Prompt/profile-uuids "$UPDATED_VALUE"
dconf write /org/gnome/Ptyxis/profile-uuids "$UPDATED_VALUE"

View file

@ -1,16 +1,16 @@
#!/usr/bin/bash
# create a Prompt profile using dconf given the guid of the instance
# create a Ptyxis profile using dconf given the guid of the instance
# $1 = name
# dconf read /org/gnome/Prompt/Profiles/d092b3519698570a3252762c658f7629/
# /org/gnome/Prompt/Profiles/d092b3519698570a3252762c658f7629/custom-command
# dconf read /org/gnome/Ptyxis/Profiles/d092b3519698570a3252762c658f7629/
# /org/gnome/Ptyxis/Profiles/d092b3519698570a3252762c658f7629/custom-command
# 'blincus shell myubuntu'
# /org/gnome/Prompt/Profiles/d092b3519698570a3252762c658f7629/label
# /org/gnome/Ptyxis/Profiles/d092b3519698570a3252762c658f7629/label
# 'myubuntu'
# /org/gnome/Prompt/Profiles/d092b3519698570a3252762c658f7629/login-shell
# /org/gnome/Ptyxis/Profiles/d092b3519698570a3252762c658f7629/login-shell
# true
# /org/gnome/Prompt/Profiles/d092b3519698570a3252762c658f7629/use-custom-command
# /org/gnome/Ptyxis/Profiles/d092b3519698570a3252762c658f7629/use-custom-command
# true
# if dconf doesn't exist, just return
@ -41,7 +41,7 @@ if test -z "$guid"; then
guid=$(gen_uuid)
fi
default_guid=$(dconf read /org/gnome/Prompt/default-profile-uuid)
default_guid=$(dconf read /org/gnome/Ptyxis/default-profile-uuid)
default_guid=${default_guid:1:-1}
# If default profile is trying to be made, just exit
@ -57,11 +57,11 @@ fi
# Write the default value if specified
if test "$make_default" -eq 1; then
dconf write /org/gnome/Prompt/default-profile-uuid "'${guid}'"
dconf write /org/gnome/Ptyxis/default-profile-uuid "'${guid}'"
fi
profile="/org/gnome/Prompt/Profiles/${guid}/"
opacity=$(dconf read /org/gnome/Prompt/Profiles/"${default_guid}"/opacity)
profile="/org/gnome/Ptyxis/Profiles/${guid}/"
opacity=$(dconf read /org/gnome/Ptyxis/Profiles/"${default_guid}"/opacity)
if test "$name" = "Host"; then
dconf write "${profile}label" "'${name}'"
@ -86,4 +86,4 @@ elif test "$name" = "ubuntu-toolbox"; then
dconf write "${profile}palette" "'Clone Of Ubuntu'"
fi
/usr/libexec/prompt-add-profile.sh "$guid"
/usr/libexec/ptyxis-add-profile.sh "$guid"

View file

@ -1,5 +1,5 @@
#!/usr/bin/bash
# ensure that the prompt profiles for deleted instances are removed
# ensure that the ptyxis profiles for deleted instances are removed
# if dconf doesn't exist, just return
if ! command -v dconf >/dev/null; then
@ -7,15 +7,15 @@ if ! command -v dconf >/dev/null; then
fi
# Cleanup any stale profiles
for i in $(dconf list /org/gnome/Prompt/Profiles/); do
for i in $(dconf list /org/gnome/Ptyxis/Profiles/); do
i=${i:0:-1}
[[ $(dconf read /org/gnome/Prompt/profile-uuids) =~ $i ]] || dconf reset -f "/org/gnome/Prompt/Profiles/${i}/"
[[ $(dconf read /org/gnome/Ptyxis/profile-uuids) =~ $i ]] || dconf reset -f "/org/gnome/Ptyxis/Profiles/${i}/"
done
name="$1"
# Read the current value of the array
CURRENT_VALUE=$(dconf read /org/gnome/Prompt/profile-uuids)
CURRENT_VALUE=$(dconf read /org/gnome/Ptyxis/profile-uuids)
# remove the leading and trailing brackets
CURRENT_VALUE=${CURRENT_VALUE:1:-1}
@ -27,7 +27,7 @@ CURRENT_VALUE=${CURRENT_VALUE// /}
IFS=',' read -r -a array <<<"$CURRENT_VALUE"
# Get Default
DEFAULT_VALUE=$(dconf read /org/gnome/Prompt/default-profile-uuid)
DEFAULT_VALUE=$(dconf read /org/gnome/Ptyxis/default-profile-uuid)
# loop through the array and remove any that don't exist
for i in "${!array[@]}"; do
@ -37,7 +37,7 @@ for i in "${!array[@]}"; do
guid=${guid//\'/}
#echo "Checking profile for $(red $guid)"
profile="/org/gnome/Prompt/Profiles/${guid}/"
profile="/org/gnome/Ptyxis/Profiles/${guid}/"
ublue_os=$(dconf read "${profile}ublue-os")
label=$(dconf read "${profile}label")
@ -59,7 +59,7 @@ for i in "${!array[@]}"; do
UPDATED_VALUE="[$UPDATED_VALUE]"
# Write the updated array back to dconf
dconf write /org/gnome/Prompt/profile-uuids "$UPDATED_VALUE"
dconf write /org/gnome/Ptyxis/profile-uuids "$UPDATED_VALUE"
fi
fi
done

View file

@ -1,6 +0,0 @@
[Service]
ExecStartPre=-/usr/libexec/prompt-remove-profile.sh %N
ExecStartPost=-/usr/libexec/prompt-create-profile.sh %N
ExecStop=-/usr/libexec/prompt-remove-profile.sh %N

View file

@ -0,0 +1,6 @@
[Service]
ExecStartPre=-/usr/libexec/ptyxis-remove-profile.sh %N
ExecStartPost=-/usr/libexec/ptyxis-create-profile.sh %N
ExecStop=-/usr/libexec/ptyxis-remove-profile.sh %N