← Back to branch summary

~ubuntu-branches/ubuntu/wily/playonlinux/wily-proposed

« back to all changes in this revision

Viewing changes to lib/setupwindow.lib

  • Committer: Package Import Robot
  • Author(s): Bertrand Marc
  • Date: 2011-12-10 15:48:27 UTC
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20111210154827-7nmqzvmrzmo5uuc6
Tags: upstream-4.0.14
Import upstream version 4.0.14

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/setupwindow.lib
687
687
        fi      
688
688
        mkdir -p "$POL_USER_ROOT/configurations/setups/$name"
689
689
        cd "$POL_USER_ROOT/configurations/setups/$name"
690
 
 
691
 
        if [ "$1" == "--force" ] || [ ! -e "top" ]
 
690
    
 
691
    if [ "$top" == "" ]
 
692
    then
 
693
        export POL_SetupWindow_TopImage="$PLAYONLINUX/etc/setups/default/top.png"
 
694
        elif [ "$1" == "--force" ] || [ ! -e "top" ]
692
695
        then
693
 
                wget -q --timeout=10 "$top" -O top 2> /dev/null && POL_SetupWindow_TopImage="$PWD/top" || export POL_SetupWindow_TopImage="$PLAYONLINUX/etc/setups/default/top.png"
 
696
                wget -4 -q --timeout=10 "$top" -O top 2> /dev/null && POL_SetupWindow_TopImage="$PWD/top" || export POL_SetupWindow_TopImage="$PLAYONLINUX/etc/setups/default/top.png"
694
697
                if [ "$POL_SetupWindow_TopImage" = "$PLAYONLINUX/etc/setups/default/top.png" ]
695
698
                then
696
699
                        rm -f top
699
702
                POL_SetupWindow_TopImage="$PWD/top"
700
703
        fi
701
704
 
702
 
        if [ "$1" == "--force" ] || [ ! -e "left" ]
 
705
    if [ "$left" == "" ]
 
706
    then
 
707
        export POL_SetupWindow_LeftImage="$PLAYONLINUX/etc/setups/default/left.jpg"
 
708
        elif [ "$1" == "--force" ] || [ ! -e "left" ]
703
709
        then
704
 
                wget -q --timeout=10 "$left" -O left 2> /dev/null && POL_SetupWindow_LeftImage="$PWD/left" || export POL_SetupWindow_LeftImage="$PLAYONLINUX/etc/setups/default/left.jpg"
 
710
                wget -4 -q --timeout=10 "$left" -O left 2> /dev/null && POL_SetupWindow_LeftImage="$PWD/left" || export POL_SetupWindow_LeftImage="$PLAYONLINUX/etc/setups/default/left.jpg"
705
711
                if [ "$POL_SetupWindow_LeftImage" = "$PLAYONLINUX/etc/setups/default/left.jpg" ]
706
712
                then
707
713
                        rm -f left
923
929
        
924
930
        POL_SetupWindow_icon_menu "$(eval_gettext "Please choose an installation method")" "$TITLE"  "$STR" "~" "$POL_USER_ROOT/tmp/cache/icons/InstallMethod" "$ICO"
925
931
        
 
932
        # Si l'utilisateur n'a rien choisi
 
933
        if [ "$APP_ANSWER" = "" ]
 
934
        then
 
935
                POL_SetupWindow_InstallMethod "$@"
 
936
                return
 
937
        fi
 
938
        
926
939
        [ "$APP_ANSWER" = "$LNG_LOCAL" ] && INSTALL_METHOD="LOCAL"
927
940
        [ "$APP_ANSWER" = "$LNG_STEAM" ] && INSTALL_METHOD="STEAM"
928
941
        [ "$APP_ANSWER" = "$LNG_STEAM_DEMO" ] && INSTALL_METHOD="STEAM_DEMO"