WhatsApp: Merge pull request #963 from cycool29/master

Fix some WhatsApp issue
pull/966/head
Botspot 4 years ago committed by GitHub
commit 0a9bdc1baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -7,21 +7,21 @@ function error {
exit 1 exit 1
} }
cd $HOME rm -rf ~/whatsapp.tar.xz ~/WhatsApp
rm -f WhatsAppWeb-linux-armv7l.tar.xz mkdir ~/WhatsApp
wget https://github.com/Itai-Nelken/Nativefier-WebApps/releases/download/v3.0/WhatsAppWeb-linux-armv7l.tar.xz || error 'Failed to download!'
tar -xf WhatsAppWeb-linux-armv7l.tar.xz || error "Failed to extract!" wget -O ~/whatsapp.tar.xz https://github.com/cycool29/whatsapp-for-linux/releases/download/rpi-v1.0/WhatsApp-linux-armv7l.tar.xz || error 'Failed to download!'
rm WhatsAppWeb-linux-armv7l.tar.xz tar -xf ~/whatsapp.tar.xz -C ~/WhatsApp || error "Failed to extract!"
mv "WhatsAppWeb-linux-armv7l" WhatsAppWeb rm ~/whatsapp.tar.xz
mv ~/WhatsApp/WhatsApp-linux-armv7l/* ~/WhatsApp && rm -rf ~/WhatsApp/WhatsApp-linux-armv7l
#create menu shortcut #create menu shortcut
echo "[Desktop Entry] echo "[Desktop Entry]
Name=Whatsapp Web Name=WhatsApp
Comment=Nativefier Whatsapp Web webapp. Exec=bash -c "\""rm -rf $HOME/.config/whats*/Service* ; $HOME/WhatsApp/WhatsApp"\""
Exec=$HOME/WhatsAppWeb/WhatsAppWeb Path=$HOME/WhatsApp
Path=$HOME/WhatsAppWeb
Icon=$(dirname "$0")/icon-64.png Icon=$(dirname "$0")/icon-64.png
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Type=Application Type=Application
Categories=Network;" > ~/.local/share/applications/whatsappweb.desktop || error "Failed to create menu button!" Categories=Network;" > ~/.local/share/applications/whatsapp.desktop || error "Failed to create menu button!"

@ -7,21 +7,21 @@ function error {
exit 1 exit 1
} }
cd $HOME rm -rf ~/whatsapp.tar.xz ~/WhatsApp
rm -f WhatsAppWeb-linux-arm64.tar.xz mkdir ~/WhatsApp
wget https://github.com/Itai-Nelken/Nativefier-WebApps/releases/download/v3.0/WhatsAppWeb-linux-arm64.tar.xz || error 'Failed to download!'
tar -xf WhatsAppWeb-linux-arm64.tar.xz || error "Failed to extract!" wget -O ~/whatsapp.tar.xz https://github.com/cycool29/whatsapp-for-linux/releases/download/rpi-arm64-1.0/WhatsApp-linux-arm64.tar.xz || error 'Failed to download!'
rm WhatsAppWeb-linux-arm64.tar.xz tar -xf ~/whatsapp.tar.xz -C ~/WhatsApp || error "Failed to extract!"
mv "WhatsAppWeb-linux-arm64" WhatsAppWeb rm ~/whatsapp.tar.xz
mv ~/WhatsApp/WhatsApp-linux-armv7l/* ~/WhatsApp && rm -rf ~/WhatsApp/WhatsApp-linux-armv7l
#create menu shortcut #create menu shortcut
echo "[Desktop Entry] echo "[Desktop Entry]
Name=Whatsapp Web Name=WhatsApp
Comment=Nativefier Whatsapp Web webapp. Exec=bash -c "\""rm -rf $HOME/.config/whats*/Service* ; $HOME/WhatsApp/WhatsApp"\""
Exec=$HOME/WhatsAppWeb/WhatsAppWeb Path=$HOME/WhatsApp
Path=$HOME/WhatsAppWeb
Icon=$(dirname "$0")/icon-64.png Icon=$(dirname "$0")/icon-64.png
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Type=Application Type=Application
Categories=Network;" > ~/.local/share/applications/whatsappweb.desktop || error "Failed to create menu button!" Categories=Network;" > ~/.local/share/applications/whatsapp.desktop || error "Failed to create menu button!"

@ -8,8 +8,12 @@ function error {
} }
#for backwards compatibility with the chromium version #for backwards compatibility with the chromium version
rm -rf ~/WhatsappWeb &>/dev/null rm -rf ~/WhatsappWeb
#for backwards compatibility with Itai's version
rm -rf ~/WhatsAppWeb rm -rf ~/WhatsAppWeb
rm ~/.local/share/applications/whatsappweb.desktop rm -f ~/.local/share/applications/whatsappweb.desktop
rm -rf ~/WhatsApp
rm -f ~/.local/share/applications/whatsapp.desktop
exit 0 exit 0

Loading…
Cancel
Save