Woof2: Check-in [0d7b69d187]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	0d7b69d1879d7a8f87cfadf8da2cfed80c313f31
Date:	2012-03-14 00:36:31
User:	BarryK
Comment:	quicksetup fix network frame, ppm noarch repo download url

Tags And Properties

branch=trunk inherited from [7b0fdb6f2f]
sym-trunk inherited from [7b0fdb6f2f]

Changes

hide diffs unified diffs patch

Changes to woof-code/rootfs-skeleton/usr/local/petget/downloadpkgs.sh

--- Old (1790eef6a71bbff4)
+++ New (1a81ff4ee934b77c)
 #!/bin/sh
 #(c) Copyright Barry Kauler 2009, puppylinux.com
 #2009 Lesser GPL licence v2 (see /usr/share/doc/legal).
 #called from /usr/local/petget/installpreview.sh
 #The database entries for the packages to be installed are in /tmp/petget_missing_dbentries-*
 #101016 do not offer to trim-the-fat if install pet pkg(s).
 #101116 call download_file to download pkg, instead of direct run of wget.
 #101118 improve test fail and exit number.
 #110812 hack for pets that are in quirky site at ibiblio.
 #120203 BK: internationalized.
+#120313 'noarch' repo is on quirky ibiblio site.
 export TEXTDOMAIN=petget___downloadpkgs.sh
 export OUTPUT_CHARSET=UTF-8
 #export LANG=C
  OFFICIAL_REPO='puppylinux'
  [ "$REPO_DEFAULT_SUBSUBDIR" == "quirky" ] && OFFICIAL_REPO='quirky' #100903
  [ "$REPO_DEFAULT_SUBSUBDIR" == "wary5" ] && OFFICIAL_REPO='quirky' #101014 wary5 pets also in quirky repo.
  [ "$REPO_DEFAULT_SUBSUBDIR" == "common" ] && OFFICIAL_REPO='quirky' #110812
  [ "$REPO_DEFAULT_SUBSUBDIR" == "drake" ] && OFFICIAL_REPO='quirky' #110812
+ [ "$REPO_DEFAULT_SUBSUBDIR" == "noarch" ] && OFFICIAL_REPO='quirky' #120313
  #if [ "$REPO_DEFAULT_SUBSUBDIR" == "quirky" -o "$REPO_DEFAULT_SUBSUBDIR" == "wary5" ];then #100903 101014 wary5 pets also in quirky repo.
  if [ "$OFFICIAL_REPO" = "quirky" ];then #110812
   #TMPPETGETREPOS="`grep -v '/puppylinux' /tmp/petget_repos`"
   TMPPETGETREPOS="`grep '/quirky' /tmp/petget_repos`" #100926 fix hack, one puppy repo does not have "puppylinux" in url.
 fi
 exit $EXITVAL #101118
 ###END###

Changes to woof-code/rootfs-skeleton/usr/sbin/quicksetup

--- Old (5d259fb42831fdb2)
+++ New (4c4221d689e0f3a3)
 #!/bin/sh
 #(c) Copyright Barry Kauler Oct. 2011, http://bkhome.org
 #License: Oct. 2011, GPL3 (refer /usr/share/doc/legal)
 #A GUI when start desktop first time, to replace the text-mode dialogs (locale, keyboard-layout, timezone)
 #inspired by shinobar's countrywizard.qs (firstrun), but a complete rewrite.
 #120228 L18L: enabling adding locale without utf8 using regexp.
 #120301 no, don't load console font here. seems to get dropped on exit from X. (instead, do it in xwin. now have /sbin/load_consolefont)
 #120305 check if langpack available in noarch repo.
 #120311 change persistence logic for 120227.
 #120313 hardcode translations for popup if user changes locale.
+#120313 restrict network frame to only be in main quicksetup window.
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@}
 export TEXTDOMAIN=quicksetup
 export OUTPUT_CHARSET=UTF-8
     fi
    fi
   fi
  fi
 fi
-if [ -f /var/local/quicksetup-network-check-flag1 ];then
+if [ "$MYBASE" = "quicksetup" ];then #120313 only allow in main quicksetup window.
@@ | / 134 / if [ -f /var/local/quicksetup-network-check-flag1 ];then @@
     SET_NETWORK="yes"
     HOSTNAME="`cat /etc/hostname`" #do not use $HOSTNAME, as hostname-set may have just been run.
     H_net=$(gettext "Your computer has been assigned a unique name, known as the 'hostname', by which it identifies itself on a network. However, you might wish to change that to a name that is more meaningful to yourself, such as 'johnsmithpc'. The hostname can have letters and numbers, no spaces.")
     export DLG_HELP_NET="<window resizable=\"false\" title=\"$(gettext 'Help: Network')\" icon-name=\"${HELPICON}\" window_position=\"1\"><vbox><text use-markup=\"true\"><label>\"${H_net}\"</label><variable>VAR_HELP_NET</variable></text><hbox><button><label>${M_close}</label><action type=\"closewindow\">VAR_HELP_NET</action></button></hbox></vbox></window>"
     NETWORK_XML="<frame $(gettext 'Network settings')>
        <input file>/usr/local/lib/X11/mini-icons/mini-question.xpm</input>
        <action type=\"launch\">DLG_HELP_NET</action>
       </button>
      </hbox>
     </frame>"
+ fi
 fi
@@ 154 / < @@
 ###Country localization###
 if [ "$SET_COUNTRY" ];then
  ###Choose locale###
   exec restartwm `cat /etc/windowmanager`
  fi
 fi
 ###END###