Attachment 369 Details for Bug 154 – Patch for script attached to prev post.

Patch for script attached to prev post.

Skype-EN_x86_64.patch (text/plain), 1.97 KB, created by Barry Jackson on 2011-05-08 23:31:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2011-05-08 23:31:34 CEST

Size: 1.97 KB

patch

obsolete

>--- Skype-EN_x86_64.sh_orig	2011-05-08 18:46:47.000000000 +0100
>+++ Skype-EN_x86_64.sh	2011-05-08 22:12:59.780038764 +0100
>@@ -28,13 +28,15 @@
> # First stable release.
> 
> clear
>+rm /var/log/Skype4Mandriva.log -f
>+touch /var/log/Skype4Mandriva.log
> 
> # Remove Skype {
> echo ""
> echo "... Tar bort Ã¤ldre Skype-filer som Ã¤r installerade i din dator."
> echo ""
> urpme skype -a --auto &> /var/log/Skype4Mandriva.log
>-rm -rf /bin/skype/ &> /var/log/Skype4Mandriva.log
>+rm -rf /opt/skype/ &> /var/log/Skype4Mandriva.log
> rm -f /usr/local/bin/skype &> /var/log/Skype4Mandriva.log
> rm -f /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
> rm -f /usr/share/icons/SkypeBlue_48x48.png &> /var/log/Skype4Mandriva.log
>@@ -65,12 +67,12 @@
> 
> # Install Skype {
> echo "... Now I'm installing Skype on your system and generating a Skype-loader, according to the Freedesktop.org specs."
>-mkdir /bin/skype/ &> /var/log/Skype4Mandriva.log
>+mkdir /opt/skype/ &> /var/log/Skype4Mandriva.log 
> cp -axRf /tmp/Skype4Mandriva/skype-*/* /opt/skype/ &> /var/log/Skype4Mandriva.log
>-cp -axf /bin/skype/icons/SkypeBlue_48x48.png /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
>-cp -axf /bin/skype/icons/* /usr/share/icons/ &> /var/log/Skype4Mandriva.log
>-cp -axf /bin/skype/skype.desktop /usr/share/applications/ &> /var/log/Skype4Mandriva.log
>-echo "/bin/skype/skype --resources=/bin/skype/" > /usr/local/bin/skype && chmod +x /usr/local/bin/skype #Generating the Skype launcher
>+cp -axf /opt/skype/icons/SkypeBlue_48x48.png /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
>+cp -axf /opt/skype/icons/* /usr/share/icons/ &> /var/log/Skype4Mandriva.log
>+cp -axf /opt/skype/skype.desktop /usr/share/applications/ &> /var/log/Skype4Mandriva.log
>+echo "/opt/skype/skype --resources=/bin/skype/" > /usr/local/bin/skype && chmod +x /usr/local/bin/skype #Generating the Skype launcher
> echo "echo Skype4Mandriva V 2.2 - May 8th 2011" > /usr/bin/Skype4MandrivaVersion && chmod +x /usr/bin/Skype4MandrivaVersion
> # Install Skype }
>

--- Skype-EN_x86_64.sh_orig	2011-05-08 18:46:47.000000000 +0100
+++ Skype-EN_x86_64.sh	2011-05-08 22:12:59.780038764 +0100
@@ -28,13 +28,15 @@
 # First stable release.
 
 clear
+rm /var/log/Skype4Mandriva.log -f
+touch /var/log/Skype4Mandriva.log
 
 # Remove Skype {
 echo ""
 echo "... Tar bort Ã¤ldre Skype-filer som Ã¤r installerade i din dator."
 echo ""
 urpme skype -a --auto &> /var/log/Skype4Mandriva.log
-rm -rf /bin/skype/ &> /var/log/Skype4Mandriva.log
+rm -rf /opt/skype/ &> /var/log/Skype4Mandriva.log
 rm -f /usr/local/bin/skype &> /var/log/Skype4Mandriva.log
 rm -f /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
 rm -f /usr/share/icons/SkypeBlue_48x48.png &> /var/log/Skype4Mandriva.log
@@ -65,12 +67,12 @@
 
 # Install Skype {
 echo "... Now I'm installing Skype on your system and generating a Skype-loader, according to the Freedesktop.org specs."
-mkdir /bin/skype/ &> /var/log/Skype4Mandriva.log
+mkdir /opt/skype/ &> /var/log/Skype4Mandriva.log 
 cp -axRf /tmp/Skype4Mandriva/skype-*/* /opt/skype/ &> /var/log/Skype4Mandriva.log
-cp -axf /bin/skype/icons/SkypeBlue_48x48.png /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
-cp -axf /bin/skype/icons/* /usr/share/icons/ &> /var/log/Skype4Mandriva.log
-cp -axf /bin/skype/skype.desktop /usr/share/applications/ &> /var/log/Skype4Mandriva.log
-echo "/bin/skype/skype --resources=/bin/skype/" > /usr/local/bin/skype && chmod +x /usr/local/bin/skype #Generating the Skype launcher
+cp -axf /opt/skype/icons/SkypeBlue_48x48.png /usr/share/icons/skype.png &> /var/log/Skype4Mandriva.log
+cp -axf /opt/skype/icons/* /usr/share/icons/ &> /var/log/Skype4Mandriva.log
+cp -axf /opt/skype/skype.desktop /usr/share/applications/ &> /var/log/Skype4Mandriva.log
+echo "/opt/skype/skype --resources=/bin/skype/" > /usr/local/bin/skype && chmod +x /usr/local/bin/skype #Generating the Skype launcher
 echo "echo Skype4Mandriva V 2.2 - May 8th 2011" > /usr/bin/Skype4MandrivaVersion && chmod +x /usr/bin/Skype4MandrivaVersion
 # Install Skype }

Actions: View

Attachments on bug 154: 361 | 369 | 378 | 392 | 401 | 443 | 448 | 513 | 516 | 525 | 528 | 532 | 551 | 552 | 554 | 569 | 578 | 596 | 609 | 611