diff --git a/README.md b/README.md index 1bb155f..9d83161 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ jq Install the tetosong command with: ```bash -bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/installer.sh) +bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/installer.sh) ``` once installed, make sure you add ~/.local/bin to your $PATH if it is not already there. diff --git a/autoupdater/tetosong.service b/autoupdater/tetosong.service index a7cde3c..2cb7149 100644 --- a/autoupdater/tetosong.service +++ b/autoupdater/tetosong.service @@ -4,4 +4,4 @@ Wants=tetosong.timer [Service] Type=oneshot -ExecStart=/usr/bin/bash -c "curl -s file:///home/eric/GitHub/TetoSongOfTheDay/autoupdater/updater.sh | bash" +ExecStart=/usr/bin/bash -c "curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/updater.sh | bash" diff --git a/autoupdater/updater.sh b/autoupdater/updater.sh index 2424e84..b796368 100644 --- a/autoupdater/updater.sh +++ b/autoupdater/updater.sh @@ -7,12 +7,12 @@ echo "Updating tetosong..." # check if the config file exists, if not download it and prompt the user for options. if [ ! -f ~/.local/share/tetosong/tetosong.config ]; then echo "Config file not found, downloading default..." - curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config + curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/tetosong.config fi mkdir -p ~/.local/share/tetosong -curl -sLo ~/.local/share/tetosong/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/fortunes/tetosotd/tetofortunes -curl -sLo ~/.local/share/tetosong/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/fortunes/tetosotd/tetofortunes.dat -curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/sv2SOTD.wav +curl -sLo ~/.local/share/tetosong/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/fortunes/tetosotd/tetofortunes +curl -sLo ~/.local/share/tetosong/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/fortunes/tetosotd/tetofortunes.dat +curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/sv2SOTD.wav # set up autoupdater # # i use systemd, so i use systemd timers. I'll figure out something for non-systemd users later. @@ -21,8 +21,8 @@ if [ "$AUTOUPDATE" = "YES" ]; then # write and enable systemd service file and timer user services echo "Auto-Updater enabled, updating service..." mkdir -p ~/.config/systemd/user - curl -sLo ~/.config/systemd/user/tetosong.service https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/tetosong.service - curl -sLo ~/.config/systemd/user/tetosong.timer https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/tetosong.timer + curl -sLo ~/.config/systemd/user/tetosong.service https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/tetosong.service + curl -sLo ~/.config/systemd/user/tetosong.timer https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/tetosong.timer systemctl --user daemon-reload systemctl --user enable tetosong.timer systemctl --user start tetosong.timer @@ -32,6 +32,6 @@ fi # write tetosong to ~/.local/bin and tell the user how to use it. echo "writing tetosong to ~/.local/bin" mkdir -p ~/.local/bin -curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong +curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/tetosong chmod +x ~/.local/bin/tetosong echo "Update complete" diff --git a/installer.sh b/installer.sh index cebbc75..7016e19 100644 --- a/installer.sh +++ b/installer.sh @@ -16,7 +16,7 @@ fi echo "Downloading custom fortunes and config file..." # download the config file and prompt the user for options. -curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config +curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/tetosong.config read -p "Do you want to hear Teto in your terminal? (y/n) " yn case $yn in [Yy]* ) sed -i 's|^AUDIO=.*|AUDIO="YES"|' ~/.local/share/tetosong/tetosong.config ;; @@ -29,10 +29,10 @@ case $yn in [Nn]* ) sed -i 's|^AUTOUPDATE=.*|AUTOUPDATE="NO"|' ~/.local/share/tetosong/tetosong.config ;; * ) echo "Please answer yes or no.";; esac -mkdir -p ~/.local/share/tetosong -curl -sLo ~/.local/share/tetosong/fortunes/tetosotd/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/fortunes/tetosotd/tetofortunes -curl -sLo ~/.local/share/tetosong/fortunes/tetosotd/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/fortunes/tetosotd/tetofortunes.dat -curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/sv2SOTD.wav +mkdir -p ~/.local/share/tetosong/fortunes/tetosotd +curl -sLo ~/.local/share/tetosong/fortunes/tetosotd/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/fortunes/tetosotd/tetofortunes +curl -sLo ~/.local/share/tetosong/fortunes/tetosotd/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/fortunes/tetosotd/tetofortunes.dat +curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/sv2SOTD.wav # set up autoupdater # i use systemd, so i use systemd timers. I'll figure out something for non-systemd users later. @@ -41,8 +41,8 @@ if [ "$AUTOUPDATE" = "YES" ]; then # write and enable systemd service file and timer user services echo "Autoupdater enabled, updating service..." mkdir -p ~/.config/systemd/user - curl -sLo ~/.config/systemd/user/tetosong.service https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/tetosong.service - curl -sLo ~/.config/systemd/user/tetosong.timer https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/tetosong.timer + curl -sLo ~/.config/systemd/user/tetosong.service https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/tetosong.service + curl -sLo ~/.config/systemd/user/tetosong.timer https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/tetosong.timer systemctl --user daemon-reload systemctl --user enable tetosong.timer systemctl --user start tetosong.timer @@ -52,6 +52,6 @@ fi # write tetosong to ~/.local/bin and tell the user how to use it. echo "writing tetosong to ~/.local/bin" mkdir -p ~/.local/bin -curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong +curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/tetosong chmod +x ~/.local/bin/tetosong echo "Make sure ~/.local/bin is in your PATH and you can get your Teto Song Of the Day by typing in tetosong or adding it to your bashrc :)" diff --git a/tetosong b/tetosong index 3e87c1e..f656387 100644 --- a/tetosong +++ b/tetosong @@ -4,7 +4,7 @@ while [[ $# -gt 0 ]]; do case $1 in -u|--update) echo "Downloading tetosong updater..." - bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/updater.sh) + bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/autoupdater/updater.sh) shift exit 0 ;; @@ -26,7 +26,7 @@ done # check if the config file exists, if not download it if [ ! -f ~/.local/share/tetosong/tetosong.config ]; then echo "Config file not found, downloading default..." - curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config + curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/eggs/tetosong.config fi # check if the user wants to play audio AUDIO="$(. ~/.local/share/tetosong/tetosong.config; echo $AUDIO)" @@ -40,11 +40,11 @@ if ! [ -x "$(command -v fortune)" ]; then if [ "$AUDIO" = "YES" ]; then nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/sv2SOTD.wav 2>/dev/null >/dev/null & fi - misfortune ~/.local/share/tetosong/* # fortune doesnt care if you give it a directory, apparently misfortune does. watch this be a problem when i go to add SynthV Teto in a separate file. + misfortune ~/.local/share/tetosong/fortunes/* # fortune doesnt care if you give it a directory, apparently misfortune does. watch this be a problem when i go to add easter eggs in a separate file... fi else if [ "$AUDIO" = "YES" ]; then nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/sv2SOTD.wav 2>/dev/null >/dev/null & fi - fortune ~/.local/share/tetosong + fortune ~/.local/share/tetosong/fortunes/ fi