Skip to content

Commit

Permalink
Multiple scripts: fix unintended wget-log pollution due to wget bug
Browse files Browse the repository at this point in the history
the workaround for the wget bug is to either download as regular user or download with output hidden
  • Loading branch information
theofficialgman committed Jan 20, 2024
1 parent 4907f01 commit c9ad403
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion apps/Pac-Man/install
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sudo make install || error "Could not install pacman"

rm -rf /tmp/pacman

sudo wget -O /usr/local/share/pacman_sdl/txt/gamecontrollerdb.txt https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
sudo wget -qO /usr/local/share/pacman_sdl/txt/gamecontrollerdb.txt https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt

status_green 'Installation is now done! To run: Menu -> Games -> Pacman (SDL)'

Expand Down
4 changes: 3 additions & 1 deletion apps/Shattered Pixel Dungeon/install
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ adoptium_installer || exit 1
install_packages temurin-17-jre || exit 1

sudo mkdir -p /usr/local/share/shattered-pixel-dungeon || error "Could not make directory!"
sudo wget -O /usr/local/share/shattered-pixel-dungeon/ShatteredPD-Desktop.jar https://github.com/00-Evan/shattered-pixel-dungeon/releases/download/v${version}/ShatteredPD-v${version}-Java.jar || error "Could not download game!"
wget -O /tmp/ShatteredPD-Desktop.jar https://github.com/00-Evan/shattered-pixel-dungeon/releases/download/v${version}/ShatteredPD-v${version}-Java.jar || error "Could not download game!"
sudo mv -f /tmp/ShatteredPD-Desktop.jar /usr/local/share/shattered-pixel-dungeon/ShatteredPD-Desktop.jar || error "Could not copy game to install folder!"
sudo chown root:root /usr/local/share/shattered-pixel-dungeon/ShatteredPD-Desktop.jar || error "Could not set game ownership!"

case "$arch" in
"64") path=/usr/lib/jvm/temurin-17-jre-arm64/bin/java ;;
Expand Down
2 changes: 1 addition & 1 deletion apps/Webcord/install-32
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install_packages "https://github.com/SpacingBat3/WebCord/releases/download/v${ve
if false;then
sudo sed -i 's/Name=.*/Name=Discord/g' /usr/share/applications/webcord.desktop

sudo wget -O /usr/share/pixmaps/webcord.png 'https://logodownload.org/wp-content/uploads/2017/11/discord-logo-7-1.png' || sudo cp -f "$(dirname "$0")/icon-64.png" /usr/share/pixmaps/webcord.png
sudo wget -qO /usr/share/pixmaps/webcord.png 'https://logodownload.org/wp-content/uploads/2017/11/discord-logo-7-1.png' || sudo cp -f "$(dirname "$0")/icon-64.png" /usr/share/pixmaps/webcord.png

sudo cp -f /usr/share/pixmaps/webcord.png /usr/lib/webcord/resources/app.asar.unpacked/sources/assets/icons/app.png
sudo cp -f /usr/share/pixmaps/webcord.png /usr/lib/webcord/resources/app.png
Expand Down
2 changes: 1 addition & 1 deletion apps/Webcord/install-64
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install_packages "https://github.com/SpacingBat3/WebCord/releases/download/v${ve
if false;then
sudo sed -i 's/Name=.*/Name=Discord/g' /usr/share/applications/webcord.desktop

sudo wget -O /usr/share/pixmaps/webcord.png 'https://logodownload.org/wp-content/uploads/2017/11/discord-logo-7-1.png' || sudo cp -f "$(dirname "$0")/icon-64.png" /usr/share/pixmaps/webcord.png
sudo wget -qO /usr/share/pixmaps/webcord.png 'https://logodownload.org/wp-content/uploads/2017/11/discord-logo-7-1.png' || sudo cp -f "$(dirname "$0")/icon-64.png" /usr/share/pixmaps/webcord.png

sudo cp -f /usr/share/pixmaps/webcord.png /usr/lib/webcord/resources/app.asar.unpacked/sources/assets/icons/app.png
sudo cp -f /usr/share/pixmaps/webcord.png /usr/lib/webcord/resources/app.png
Expand Down
7 changes: 7 additions & 0 deletions etc/runonce-entries
Original file line number Diff line number Diff line change
Expand Up @@ -385,4 +385,11 @@ runonce <<"EOF"
fi
EOF

#fix unintended wget-log pollution due to wget bug
runonce <<"EOF"
if ls ~/wget-log*; then
sudo_popup rm -rf ~/wget-log*
fi
EOF

true

0 comments on commit c9ad403

Please sign in to comment.