Compare commits
23 Commits
Author | SHA1 | Date |
---|---|---|
Brendan Webb | 69e4fed9b1 | |
Brendan Webb | bf630f1d4b | |
Brendan Webb | 8164fff194 | |
Brendan Webb | fc0aca957f | |
Brendan Webb | 958017264b | |
Brendan Webb | 079f270c96 | |
Brendan Webb | ce71357803 | |
Brendan Webb | ae2407a9ff | |
Brendan Webb | 15be4b3ca9 | |
Brendan Webb | f2204c4196 | |
Brendan Webb | c15894c8bd | |
Brendan Webb | 3b079b97eb | |
Brendan Webb | 00aad7f03c | |
Brendan Webb | ce2790124d | |
Brendan Webb | 6f5339e0de | |
Brendan Webb | f544ee169f | |
Brendan Webb | 812e0167f9 | |
Brendan Webb | dd8c9cca00 | |
Brendan Webb | fc5a3a21a6 | |
Brendan Webb | f90e7d0d3d | |
Brendan Webb | 888b22f1aa | |
Brendan Webb | 0f1a3d93ff | |
Brendan Webb | 09ed35989b |
|
@ -1,2 +1,4 @@
|
||||||
brendotools-wallman*
|
brendotools-wallman*
|
||||||
brendotools-wallman.zip
|
brendotools-wallman.zip
|
||||||
|
to-do.md
|
||||||
|
releasenotes_not_for_push
|
10
README.md
10
README.md
|
@ -2,4 +2,12 @@
|
||||||
|
|
||||||
## brendo's stupidly over-engineered wallpaper manager.
|
## brendo's stupidly over-engineered wallpaper manager.
|
||||||
|
|
||||||
### documentation coming... eventually.
|
### documentation coming... eventually.
|
||||||
|
|
||||||
|
### at least i hopefully fixed the update mechanism...
|
||||||
|
|
||||||
|
### i'm a fucking moron
|
||||||
|
|
||||||
|
this is entirely so i can see if i fixed a broken hook
|
||||||
|
|
||||||
|
yeah the hook didn't work
|
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
function parse() {
|
||||||
|
WPSET_REL=$(mktemp /tmp/wpset-releases-XXXXX.json)
|
||||||
|
curl -s https://tildegit.org/api/v1/repos/BrendanTCC/brendotools-wallman/tags -o $WPSET_REL
|
||||||
|
DOWNLOAD_VERSION=$(cat $WPSET_REL | jq .[0].name | sed s/\"//g)
|
||||||
|
DOWNLOAD_NOTES=$(cat $WPSET_REL | jq .[0].message | sed s/\"//g | sed 's/\\n/\
|
||||||
|
/g')
|
||||||
|
rm $WPSET_REL
|
||||||
|
}
|
||||||
|
# everything below this comment is entirely for debugging parsing.
|
||||||
|
# haha im lazy
|
||||||
|
function debug() {
|
||||||
|
parse
|
||||||
|
echo "newest tag found: $DOWNLOAD_VERSION"
|
||||||
|
echo "tag message:"
|
||||||
|
echo "$DOWNLOAD_NOTES"
|
||||||
|
}
|
||||||
|
if [ "$1" == "debug" ]; then
|
||||||
|
debug
|
||||||
|
fi
|
83
wpset
83
wpset
|
@ -1,18 +1,66 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# setting USER variable
|
||||||
|
USER=$(logname)
|
||||||
|
|
||||||
# WPDL
|
# WPDL
|
||||||
VERSION="0.1-rev81"
|
VERSION=""
|
||||||
CONF="/home/$USER/.config/wpdl.conf"
|
CONF="/home/$USER/.config/wpdl.conf"
|
||||||
source $CONF
|
source $CONF
|
||||||
|
source /etc/wpdl/parse
|
||||||
# updater
|
# updater
|
||||||
if [ "$1" = "-u" ]; then
|
if [ "$1" = "-u" ]; then
|
||||||
curl sftp://$HOST_DISP/home/$SSH_USER/bin/wpset-update -u $SSH_USER: | bash
|
# root check
|
||||||
exit
|
ROOT=$(whoami)
|
||||||
|
if [ "$ROOT" != "root" ]; then
|
||||||
|
echo "ERR_ROOT_PRIVS_REQUIRE"
|
||||||
|
echo "(try re-running this script with sudo.)"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
# contact tildegit to check for a new release
|
||||||
|
parse
|
||||||
|
# compare versions
|
||||||
|
WPSET_REMOTEVER=$(echo "$DOWNLOAD_VERSION")
|
||||||
|
WPSET_LOCALVER=$(wpset -v)
|
||||||
|
|
||||||
|
if [ "$WPSET_REMOTEVER" == "$WPSET_LOCALVER" ]; then
|
||||||
|
|
||||||
|
# tell user that there's nothing to do
|
||||||
|
echo "you are already running the latest available version of wallman."
|
||||||
|
exit
|
||||||
|
|
||||||
|
else
|
||||||
|
# download the update
|
||||||
|
cd /home/$USER/
|
||||||
|
FOLDER_CHECK=$(ls | grep brendotools-wallman)
|
||||||
|
if [ "$FOLDER_CHECK" != "" ]; then
|
||||||
|
rm -rf brendotools-wallman*
|
||||||
|
fi
|
||||||
|
git clone https://tildegit.org/BrendanTCC/brendotools-wallman/
|
||||||
|
cd brendotools-wallman
|
||||||
|
git checkout tags/$DOWNLOAD_VERSION
|
||||||
|
|
||||||
|
# set the version because GOOD GOD I'M A LAZY CUNT
|
||||||
|
echo wpset | sed "s/VERSION\=\"\"/VERSION\=\"$DOWNLOAD_VERSION\""
|
||||||
|
# install the update
|
||||||
|
mv wpset /bin/wpset
|
||||||
|
chmod +x /bin/wpset
|
||||||
|
mv parse /etc/wpdl/parse
|
||||||
|
chmod +x /etc/wpdl/parse
|
||||||
|
cd /home/$USER/
|
||||||
|
rm -rf brendotools-wallman/
|
||||||
|
echo "done."
|
||||||
|
WPSET_LOCALVER=$(wpset -v)
|
||||||
|
if [ "$WPSET_LOCALVER" == "$WPSET_REMOTEVER" ]; then
|
||||||
|
echo "success! wpset version updated to $WPSET_LOCALVER."
|
||||||
|
else
|
||||||
|
echo "something's gone wrong. wpset version is '$WPSET_LOCALVER' when it should be $WPSET_REMOTEVER.\
|
||||||
|
try manually moving the file and running wpset -v."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# version
|
# version
|
||||||
if [ "$1" = "-v" ]; then
|
if [ "$1" = "-v" ]; then
|
||||||
echo "v$VERSION"
|
echo "$VERSION"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -63,17 +111,18 @@ else
|
||||||
|
|
||||||
# wallpaper lookup
|
# wallpaper lookup
|
||||||
WPLIST=$(wplist | grep $1)
|
WPLIST=$(wplist | grep $1)
|
||||||
if [ "$WPLIST" = "$1" ]; then
|
if [ "$WPLIST" = "$1" ]; then
|
||||||
# download the actual script
|
# download the actual script
|
||||||
curl -s sftp://$SSH_HOST/home/$SSH_USER/bin/wpdl -u $SSH_USER: -o wpdl
|
curl -s sftp://$SSH_HOST/home/$SSH_USER/bin/wpdl -u $SSH_USER: -o wpdl
|
||||||
chmod +x wpdl
|
chmod +x wpdl
|
||||||
clear
|
clear
|
||||||
$PWD/wpdl $*
|
$PWD/wpdl $*
|
||||||
rm wpdl
|
rm wpdl
|
||||||
[ -e wp.list ] && rm $PWD/wp.list
|
[ -e wp.list ] && rm $PWD/wp.list
|
||||||
else
|
else
|
||||||
clear
|
clear
|
||||||
echo "could not find the wallpaper you requested, here's a list of what's available:"
|
echo "could not find the wallpaper you requested, here's a list of what's available:"
|
||||||
wplist
|
wplist
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
17
wpset-setup
17
wpset-setup
|
@ -1,17 +1,21 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
source parse
|
||||||
|
git checkout tags/$DOWNLOAD_VERSION
|
||||||
|
|
||||||
# version
|
# setting USER variable
|
||||||
VERSION="1.0"
|
USER=$(logname)
|
||||||
|
|
||||||
# root check
|
# root check
|
||||||
ROOT=$(whoami)
|
ROOT=$(whoami)
|
||||||
if [ "$ROOT" != "root" ]; then
|
if [ "$ROOT" != "root" ]; then
|
||||||
echo "sorry, root privileges are required to continue."
|
echo "an error occurred while checking for root permissions: DONT_HAVE_EM_CHIEF"
|
||||||
|
echo "(try re-running this script with sudo.)"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# setting USER variable
|
if [ "$1" = "-u" ]; then
|
||||||
USER=$(logname)
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
# location where config file will reside.
|
# location where config file will reside.
|
||||||
# DO NOT CHANGE AS THIS IS HARD-CODED INTO
|
# DO NOT CHANGE AS THIS IS HARD-CODED INTO
|
||||||
|
@ -48,5 +52,8 @@ echo "LASTWP_LOC=\"\$WALL_LOC/.lastwp\"" >> $CONFIG
|
||||||
echo "LAST=\$(cat /home/$USER/wallpaper/.lastwp)" >> $CONFIG
|
echo "LAST=\$(cat /home/$USER/wallpaper/.lastwp)" >> $CONFIG
|
||||||
chown $USER:$USER $CONFIG
|
chown $USER:$USER $CONFIG
|
||||||
echo "done! now let's chuck wpset in /bin/..."
|
echo "done! now let's chuck wpset in /bin/..."
|
||||||
|
echo wpset | sed "s/VERSION\=\"\"/VERSION\=\"$DOWNLOAD_VERSION\""
|
||||||
mv wpset /bin/wpset
|
mv wpset /bin/wpset
|
||||||
|
mkdir -p /etc/wpdl
|
||||||
|
mv parse /etc/wpdl/parse
|
||||||
echo "done! goodbye."
|
echo "done! goodbye."
|
||||||
|
|
72
wpset-update
72
wpset-update
|
@ -1,22 +1,58 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
CONF="/home/$USER/.config/wpdl.conf"
|
function process() {
|
||||||
source $CONF
|
# install the update
|
||||||
WPSET_REMOTEVER=$(curl sftp://$SSH_HOST/home/$SSH_USER/bin/wpset -u $SSH_USER: | grep -m1 VERSION | sed "s/VERSION\=//g" | sed s/\"//g)
|
mv wpset /bin/wpset
|
||||||
WPSET_LOCALVER=$(wpset -v)
|
chmod +x /bin/wpset
|
||||||
clear
|
mv parse /etc/wpdl/parse
|
||||||
|
chmod +x /etc/wpdl/parse
|
||||||
|
cd /home/$USER/
|
||||||
|
rm -rf brendotools-wallman/
|
||||||
|
echo "done."
|
||||||
|
WPSET_LOCALVER=$(wpset -v)
|
||||||
|
if [ "$WPSET_LOCALVER" == "$WPSET_REMOTEVER" ]; then
|
||||||
|
echo "success! wpset version updated to $WPSET_LOCALVER."
|
||||||
|
else
|
||||||
|
echo "something's gone wrong. wpset version is '$WPSET_LOCALVER' when it should be $WPSET_REMOTEVER.\
|
||||||
|
try manually moving the file and running wpset -v."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
|
||||||
if [ "$WPSET_REMOTEVER" == "$WPSET_LOCALVER" ]; then
|
# root check
|
||||||
|
ROOT=$(whoami)
|
||||||
echo "no updates to install, latest version already installed"
|
if [ "$ROOT" != "root" ]; then
|
||||||
|
sudo bash wpset-update process
|
||||||
exit
|
exit
|
||||||
|
|
||||||
else
|
|
||||||
PASSWD=$(pass system/sudo)
|
|
||||||
curl sftp://$SSH_HOST/home/$SSH_USER/bin/wpset -o wpset -u $SSH_USER:
|
|
||||||
echo "$PASSWD" | sudo -S mv wpset /bin/wpset
|
|
||||||
echo "$PASSWD" | sudo -S chmod +x /bin/wpset
|
|
||||||
sleep 1
|
|
||||||
echo "wpset updated."
|
|
||||||
WPSET_LOCALVER=$(wpset -v)
|
|
||||||
echo "wpset version is now $WPSET_LOCALVER."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "process" ]; then
|
||||||
|
process
|
||||||
|
fi
|
||||||
|
|
||||||
|
# contact tildegit to see if there's a new release
|
||||||
|
cd /home/$USER/
|
||||||
|
FOLDER_CHECK=$(ls | grep brendotools-wallman)
|
||||||
|
if [ "$FOLDER_CHECK" != "" ]; then
|
||||||
|
rm -rf brendotools-wallman*
|
||||||
|
fi
|
||||||
|
git clone https://tildegit.org/BrendanTCC/brendotools-wallman/
|
||||||
|
cd brendotools-wallman
|
||||||
|
source parse
|
||||||
|
parse
|
||||||
|
git checkout tags/$DOWNLOAD_VERSION
|
||||||
|
# set the version because GOOD GOD I'M A LAZY CUNT
|
||||||
|
echo wpset | sed "s/VERSION\=\"\"/VERSION\=\"$DOWNLOAD_VERSION\""
|
||||||
|
# setting USER variable
|
||||||
|
USER=$(logname)
|
||||||
|
|
||||||
|
# root check
|
||||||
|
ROOT=$(whoami)
|
||||||
|
if [ "$ROOT" != "root" ]; then
|
||||||
|
sudo bash /home/$USER/brendotools-wallman/wpset-update process
|
||||||
|
else
|
||||||
|
process
|
||||||
|
fi
|
||||||
|
rm $WPSET_REL
|
||||||
|
|
||||||
|
echo "wpset-update is now deprecated. it's now built directly into wpset."
|
Loading…
Reference in New Issue