Skip to content

Commit

Permalink
chore(just): move ujust libraries to separate folder
Browse files Browse the repository at this point in the history
  • Loading branch information
HikariKnight committed Jan 16, 2024
1 parent 696e928 commit 15da1e9
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build/ublue-os-just/10-update.just
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ alias auto-update := toggle-updates
# Turn automatic updates on or off
toggle-updates ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
CURRENT_STATE="Disabled"
if systemctl is-enabled ublue-update.timer | grep -q enabled; then
CURRENT_STATE="Enabled"
Expand Down
2 changes: 1 addition & 1 deletion build/ublue-os-just/40-nvidia.just
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alias nvidia := configure-nvidia
# Configure the Nvidia driver
configure-nvidia ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
OPTION={{ ACTION }}
if [ "$OPTION" == "prompt" ]; then
echo "${bold}Configuring Nvidia drivers${normal}"
Expand Down
4 changes: 2 additions & 2 deletions build/ublue-os-just/50-akmods.just
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alias gamepads := configure-gamepads
# Configure gamepad drivers
configure-gamepads ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
OPTION={{ ACTION }}
if [ "$OPTION" == "prompt" ]; then
echo "${bold}Configuring gamepad drivers${normal}"
Expand Down Expand Up @@ -38,7 +38,7 @@ alias broadcom-wl := configure-broadcom-wl
# Configure Broadcom WL driver (Enabling WL breaks numerous other Wi-Fi adapters)
configure-broadcom-wl ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
OPTION={{ ACTION }}
if [ "$OPTION" == "prompt" ]; then
echo "${bold}Configuring Broadcom Wi-Fi${normal}"
Expand Down
6 changes: 3 additions & 3 deletions build/ublue-os-just/70-nix.just
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alias nix := setup-nix
# Install, uninstall or configure nix
setup-nix ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
CURRENT_STATE="Not Installed"
if [ -f "/etc/systemd/system/nix-daemon.socket" ]; then
CURRENT_STATE="Installed"
Expand Down Expand Up @@ -72,7 +72,7 @@ alias fleek := setup-fleek
# Install, uninstall or configure Fleek (https://getfleek.dev/)
setup-fleek ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
if [ ! -f "/etc/systemd/system/nix-daemon.socket" ]; then
echo "Please install nix first by running ujust setup-nix"
exit 0
Expand Down Expand Up @@ -118,7 +118,7 @@ alias devbox := setup-devbox
# Install or uninstall devbox
setup-devbox ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/libjust.sh
source /usr/lib/ujust/ujust.sh
if [ ! -f "/etc/systemd/system/nix-daemon.socket" ]; then
echo "Please install nix first by running ujust setup-nix"
exit 0
Expand Down
8 changes: 4 additions & 4 deletions build/ublue-os-just/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ cp ${SCRIPT_DIR}/*.just /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/ublue-os-just.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/ujust /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/ugum /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/libjust.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/libcolors.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/libformatting.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/libfunctions.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/lib-ujust/ujust.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/lib-ujust/libcolors.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/lib-ujust/libformatting.sh /tmp/ublue-os/rpmbuild/SOURCES
cp ${SCRIPT_DIR}/lib-ujust/libfunctions.sh /tmp/ublue-os/rpmbuild/SOURCES

rpmbuild -ba \
--define '_topdir /tmp/ublue-os/rpmbuild' \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion build/ublue-os-just/ublue-os-just.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Source8: 70-nix.just
Source9: ujust
Source10: ugum
Source11: header.just
Source12: libjust.sh
Source12: ujust.sh
Source13: libcolors.sh
Source14: libformatting.sh
Source15: libfunctions.sh
Expand Down

0 comments on commit 15da1e9

Please sign in to comment.