Magellan Linux

Diff of /trunk/pkgtools/up2date.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3111 by niro, Mon May 13 11:40:55 2013 UTC revision 3112 by niro, Fri Mar 15 11:30:25 2019 UTC
# Line 2  Line 2 
2    
3  source /usr/lib/mage/mage4.functions.sh  source /usr/lib/mage/mage4.functions.sh
4  source /usr/lib/mage/smage2.functions.sh  source /usr/lib/mage/smage2.functions.sh
5    source /etc/mage.rc.global
6    source /etc/mage.rc
7    
8  # timeout in seconds  # timeout in seconds
9  LYNX_CONNECT_TIMEOUT=10  LYNX_CONNECT_TIMEOUT=10
10  LYNX_READ_TIMEOUT=10  LYNX_READ_TIMEOUT=10
11    #LYNX_OPTIONS="-pauth=user:pass"
12    
13  ## only for tests -> normally in /etc/rc.d/init.d/functions  ## only for tests -> normally in /etc/rc.d/init.d/functions
14  COLRED="\033[1;6m\033[31m"  COLRED="\033[1;6m\033[31m"
# Line 33  fi Line 36  fi
36    
37  die() { echo "Error: $@"; exit 1; }  die() { echo "Error: $@"; exit 1; }
38    
39  sminclude() { true; }  #sminclude() { true; }
40  msetfeature() { true; }  #msetfeature() { true; }
41  mqueryfeature() { true; }  #mqueryfeature() { true; }
42  haskell_enable_feature() { true; }  #haskell_enable_feature() { true; }
43  haskell_disable_feature() { true; }  #haskell_disable_feature() { true; }
44    
45    SILENT=1
46    FVERBOSE=off
47    
48    utf8encode()
49    {
50     iconv --from-code=ISO_8859-15 --to-code=UTF-8 $@
51    }
52    
53  urlencode()  urlencode()
54  {  {
# Line 75  urlencode() Line 86  urlencode()
86   echo "${uri}"   echo "${uri}"
87  }  }
88    
89  lasttarball()  upsort()
90    {
91     local allversions="$@"
92     [[ -n ${allversions} ]] || die "upsort(): no versions given"
93    
94     if [ -x /home/tjoke/archlinux_version/highestver ]
95     then
96     /home/tjoke/archlinux_version/highestver ${allversions}
97     else
98     for i in ${allversions}
99     do
100     echo "${i}"
101     done | sort -g | tac | head -n 1
102     fi
103    }
104    
105    upsort_pipe()
106    {
107     local data
108     local versions
109    
110     versions=""
111     while read data
112     do
113     versions+="${data} "
114     done
115    
116     upsort ${versions}
117    }
118    
119    #highesttarball()
120    #{
121    # local suffix=bz2
122    # local seperator="-"
123    # [[ ! -z $1 ]] && suffix="$1"
124    # local data
125    # local version
126    #
127    # [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"
128    # [[ ${UP2SEPERATOR} = NULL ]] && seperator=""
129    #
130    # case ${suffix} in
131    # tbz2|tgz|zip)
132    # if [[ ! -z ${UP2EXCLUDE} ]]
133    # then
134    # grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/" | upsort_pipe
135    # else
136    # grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/" | upsort_pipe
137    # fi
138    # ;;
139    # *)
140    # if [[ ! -z ${UP2EXCLUDE} ]]
141    # then
142    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/" | upsort_pipe
143    # else
144    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/" | upsort_pipe
145    # fi
146    # ;;
147    # esac
148    #}
149    
150    #lasttarball()
151    #{
152    # local suffix=bz2
153    # local seperator="-"
154    # [[ ! -z $1 ]] && suffix="$1"
155    #
156    # [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"
157    # [[ ${UP2SEPERATOR} = NULL ]] && seperator=""
158    #
159    # case ${suffix} in
160    # tbz2|tgz|zip)
161    # if [[ ! -z ${UP2EXCLUDE} ]]
162    # then
163    # grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;$ p"
164    # else
165    # grep "\(\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;$ p"
166    # fi
167    # ;;
168    # *)
169    # if [[ ! -z ${UP2EXCLUDE} ]]
170    # then
171    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p"
172    # else
173    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p"
174    # fi
175    # ;;
176    # esac
177    #}
178    
179    #firsttarball()
180    #{
181    # local suffix=bz2
182    # local seperator="-"
183    # [[ ! -z $1 ]] && suffix="$1"
184    #
185    # [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"
186    # [[ ${UP2SEPERATOR} = NULL ]] && seperator=""
187    #
188    # case ${suffix} in
189    # tbz2|tgz|zip)
190    # if [[ ! -z ${UP2EXCLUDE} ]]
191    # then
192    # grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;q"
193    # else
194    # grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;q"
195    # fi
196    # ;;
197    # *)
198    # if [[ ! -z ${UP2EXCLUDE} ]]
199    # then
200    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;q"
201    # else
202    # grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;q"
203    # fi
204    # ;;
205    # esac
206    #}
207    
208    tarballversions()
209  {  {
210   local suffix=bz2   local suffix=bz2
211   local seperator="-"   local seperator="-"
212   [[ ! -z $1 ]] && suffix="$1"   [[ ! -z $1 ]] && suffix="$1"
213     local data
214     local version
215    
216   [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"   [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"
217   [[ ${UP2SEPERATOR} = NULL ]] && seperator=""   [[ ${UP2SEPERATOR} = NULL ]] && seperator=""
218    
219   case ${suffix} in   case ${suffix} in
220   tbz2|tgz)   tbz2|tgz|zip)
221   if [[ ! -z ${UP2EXCLUDE} ]]   if [[ ! -z ${UP2EXCLUDE} ]]
222   then   then
223   grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;$ p"   grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/"
224   else   else
225   grep "\(\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;$ p"   grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/"
226   fi   fi
227   ;;   ;;
228   *)   *)
229   if [[ ! -z ${UP2EXCLUDE} ]]   if [[ ! -z ${UP2EXCLUDE} ]]
230   then   then
231   grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p"   grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/"
232   else   else
233   grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p"   grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/"
234   fi   fi
235   ;;   ;;
236   esac   esac
237  }  }
238    
239  firsttarball()  highesttarball()
240  {  {
241   local suffix=bz2   tarballversions $@ | upsort_pipe
242   local seperator="-"  }
  [[ ! -z $1 ]] && suffix="$1"  
243    
244   [[ ! -z ${UP2SEPERATOR} ]] && seperator="${UP2SEPERATOR}"  lasttarball()
245   [[ ${UP2SEPERATOR} = NULL ]] && seperator=""  {
246     tarballversions $@ | sed -n "$ p"
247    }
248    
249   case ${suffix} in  firsttarball()
250   tbz2|tgz)  {
251   if [[ ! -z ${UP2EXCLUDE} ]]   tarballversions $@ | sed "q"
  then  
  grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;q"  
  else  
  grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.${suffix}\).*/\1/;q"  
  fi  
  ;;  
  *)  
  if [[ ! -z ${UP2EXCLUDE} ]]  
  then  
  grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;q"  
  else  
  grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*${seperator}\(.*\)\(\.tar\.${suffix}\).*/\1/;q"  
  fi  
  ;;  
  esac  
252  }  }
253    
254  updatecmd()  updatecmd()
# Line 139  updatecmd() Line 257  updatecmd()
257   local useragent   local useragent
258   [[ ! -z ${UP2USERAGENT} ]] && useragent="-useragent '${UP2USERAGENT}'"   [[ ! -z ${UP2USERAGENT} ]] && useragent="-useragent '${UP2USERAGENT}'"
259    
260   uppver=$(lynx -connect_timeout=${LYNX_CONNECT_TIMEOUT} -read_timeout=${LYNX_READ_TIMEOUT} -dump "${useragent}" $@)   uppver=$(lynx ${LYNX_OPTIONS} -connect_timeout=${LYNX_CONNECT_TIMEOUT} -read_timeout=${LYNX_READ_TIMEOUT} -dump "${useragent}" $@ | utf8encode)
261   if [[ $? -ne 0 ]]   if [[ $? -ne 0 ]]
262   then   then
263   echo "Error connecting '$@'"   echo "Error connecting '$@'"
# Line 168  updatecmd_gnu() Line 286  updatecmd_gnu()
286   [[ ! -z ${UP2TARBALL} ]] && tarball="${UP2TARBALL}"   [[ ! -z ${UP2TARBALL} ]] && tarball="${UP2TARBALL}"
287    
288   # remove 'latest' tarball too   # remove 'latest' tarball too
289   updatecmd "http://ftp.gnu.org/gnu/${pname}/?C=M;O=A" | grep ${tarball}- | sed '/latest/d' | lasttarball "${archive}"   updatecmd "http://ftp.gnu.org/gnu/${pname}" | grep "${tarball}-" | sed '/latest/d' | highesttarball "${archive}"
290  }  }
291    
292  updatecmd_sourceforge_old()  updatecmd_sourceforge_old()
# Line 461  updatecmd_sourceforge() Line 579  updatecmd_sourceforge()
579   local project_id   local project_id
580   local tarballname   local tarballname
581   local seperator   local seperator
582   local rss_limit=30   local rss_limit=50
583   local tarballprefix   local tarballprefix
584   local uppver   local uppver
585   local allver   local allver
# Line 496  updatecmd_sourceforge() Line 614  updatecmd_sourceforge()
614   [[ ${UP2SEPERATOR} = NULL ]] && seperator=""   [[ ${UP2SEPERATOR} = NULL ]] && seperator=""
615    
616   uri="http://sourceforge.net/projects/${projectname}"   uri="http://sourceforge.net/projects/${projectname}"
617   project_id=$(updatecmd ${uri} | grep project-id | sed -e 's:.*project-id/::;s:/.*::')  # project_id=$(updatecmd ${uri} | grep project-id | sed -e 's:.*project-id/::;s:/.*::')
618   rss_uri="http://sourceforge.net/api/file/index/project-id/${project_id}/mtime/desc/limit/${rss_limit}/rss"  # rss_uri="http://sourceforge.net/api/file/index/project-id/${project_id}/mtime/desc/limit/${rss_limit}/rss"
619     rss_uri="${uri}/rss?path=/"
620    
621   case ${archive} in   case ${archive} in
622   bz2|gz|xz) tarballprefix=".tar.${archive}" ;;   bz2|gz|xz) tarballprefix=".tar.${archive}" ;;
623     archive-bz2|archive-gz|archive-xz) tarballprefix=".${archive/archive-/}" ;;
624   tbz|tbz2|txz|tgz|zip|rar|7z|jar) tarballprefix=".${archive}" ;;   tbz|tbz2|txz|tgz|zip|rar|7z|jar) tarballprefix=".${archive}" ;;
625   *) tarballprefix="${archive}" ;;   *) tarballprefix=".${archive}" ;;
626   esac   esac
627    
628   if [[ -x $(type -P xml) ]]   if [[ -x $(type -P xml) ]]
# Line 519  updatecmd_sourceforge() Line 639  updatecmd_sourceforge()
639    
640   allver=$(echo "${allver}" | grep "/${subprojectname}.*/${tarballname}${seperator}.*${tarballprefix}" | sed -e "s:.*${tarballname}${seperator}::;s:${tarballprefix}.*::")   allver=$(echo "${allver}" | grep "/${subprojectname}.*/${tarballname}${seperator}.*${tarballprefix}" | sed -e "s:.*${tarballname}${seperator}::;s:${tarballprefix}.*::")
641   #uppver=$(echo "${allver}" | sort -g | tac | head -n 1)   #uppver=$(echo "${allver}" | sort -g | tac | head -n 1)
642   uppver=$(echo "${allver}" | sort -g | tac | head -n 1)   #uppver=$(echo "${allver}" | sort -n | tac | head -n 1)
643     uppver=$(upsort "${allver}")
644    
645   if [[ ! -z ${UP2SUBSTITUTE} ]]   if [[ ! -z ${UP2SUBSTITUTE} ]]
646   then   then
# Line 565  updatecmd_freedesktop() Line 686  updatecmd_freedesktop()
686   [[ ! -z ${UP2TARBALL} ]] && tarballname="${UP2TARBALL}"   [[ ! -z ${UP2TARBALL} ]] && tarballname="${UP2TARBALL}"
687    
688   # exclude rc versions!   # exclude rc versions!
689   updatecmd "http://${pname}.freedesktop.org/releases${subdir}?C=M;O=A" | grep ${tarballname}- | grep -v rc[0-9] | lasttarball "${archive}"   updatecmd "http://${pname}.freedesktop.org/releases${subdir}" | grep ${tarballname}- | grep -v rc[0-9] | highesttarball "${archive}"
690  }  }
691    
692  updatecmd_xorg()  updatecmd_xorg()
# Line 588  updatecmd_xorg() Line 709  updatecmd_xorg()
709   [[ ! -z ${UP2SUBDIR} ]] && subdir="${UP2SUBDIR}"   [[ ! -z ${UP2SUBDIR} ]] && subdir="${UP2SUBDIR}"
710   [[ ! -z ${UP2TARBALL} ]] && tarballname="${UP2TARBALL}"   [[ ! -z ${UP2TARBALL} ]] && tarballname="${UP2TARBALL}"
711    
712   updatecmd "http://xorg.freedesktop.org/archive/individual/${subdir}/?C=M;O=A" | grep "/${tarballname}" | lasttarball "${archive}"   updatecmd "http://xorg.freedesktop.org/archive/individual/${subdir}/?C=M;O=A" | grep "/${tarballname}" | highesttarball "${archive}"
713  }  }
714    
715  updatecmd_perl()  updatecmd_perl()
# Line 602  updatecmd_perl() Line 723  updatecmd_perl()
723    
724   uppver=$(updatecmd "http://search.cpan.org/dist/${pname}/" | lasttarball "${archive}")   uppver=$(updatecmd "http://search.cpan.org/dist/${pname}/" | lasttarball "${archive}")
725    
726          if [[ ! -z ${UP2SUBSTITUTE} ]]   if [[ ! -z ${UP2SUBSTITUTE} ]]
727          then   then
728                  echo "${uppver}" | sed "s:${UP2SUBSTITUTE}::g"   echo "${uppver}" | sed "s:${UP2SUBSTITUTE}::g"
729          else   else
730                  echo "${uppver}"   echo "${uppver}"
731          fi   fi
732    }
733    
734    updatecmd_pypi()
735    {
736     local pname="$1"
737     local archive="$2"
738     local uppver
739    # local fullarchive
740    # local tarball=
741    # local seperator
742    
743     [[ -z ${pname} ]] && die "give me a \$PNAME"
744     [[ -z ${archive} ]] && die "give me a \$ARCHIVE"
745    
746    # case ${archive} in
747    # gz|bz2) fullarchive=".tar.${archive}" ;;
748    # *) fullarchive=".${archive}" ;;
749    # esac
750    
751    # tarball="${pname}"
752    # seperator="-"
753    # [[ -z ${UP2TARBALL} ]] || tarball="${UP2TARBALL}"
754    # [[ -z ${UP2SEPERATOR} ]] || seperator="${UP2SEPERATOR}"
755    
756     # we cannot sort with C=M;O=A
757    # uppver=$(updatecmd -listonly https://pypi.python.org/packages/source/${pname:0:1}/${pname}/ | grep ${tarball} | grep ${fullarchive} | sed "s:.*${tarball}${seperator}\(.*\)${fullarchive}:\1:")
758     uppver=$(updatecmd https://pypi.python.org/pypi/${pname}/ | grep "/source/${pname:0:1}/${pname}/" | highesttarball ${archive})
759     #uppver=$(updatecmd -listonly https://pypi.python.org/pypi/${pname}/ | grep ${tarball} | grep ${fullarchive} | sed "s:.*${tarball}${seperator}\(.*\)${fullarchive}:\1:")
760    
761     upsort ${uppver}
762  }  }
763    
764  updatecmd_gnome()  updatecmd_gnome()
765  {  {
766   local uri   local uri
767   local pname="$1"   local pname="$1"
768     local mode="$2"
769     local appmajor
770    
771    
772   [[ -z ${pname} ]] && die "give me a \$PNAME"   [[ -z ${pname} ]] && die "give me a \$PNAME"
773    
774   uri="http://ftp.gnome.org/pub/gnome/sources/${pname}"   case ${mode} in
775   updatecmd ${uri}/$(updatecmd "${uri}"/?C=N\;O=D | grep '[0-9]\.[0-9]*[02468]/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')/ | grep ]LA | sed 's/.*S-\([0-9\.]*\).*/\1/'   devel|--devel) mode="devel" ;;
776     *) mode="normal" ;;
777     esac
778    
779     uri="http://ftp.gnome.org/pub/GNOME/sources/${pname}"
780     if [[ ${mode} = devel ]]
781     then
782     appmajor=$(updatecmd "${uri}"/?C=N\;O=D | grep '/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')
783     else
784     appmajor=$(updatecmd "${uri}"/?C=N\;O=D | grep '[0-9]\.[0-9]*[02468]/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')
785     fi
786    
787     updatecmd ${uri}/${appmajor}/ | grep ]LA | sed 's/.*S-\([0-9\.]*\).*/\1/' | upsort_pipe
788  }  }
789    
790  updatecmd_xfce()  updatecmd_xfce()
# Line 638  updatecmd_xfce() Line 804  updatecmd_xfce()
804   fi   fi
805    
806   uri="http://archive.xfce.org/src/${subdir}/${pname}"   uri="http://archive.xfce.org/src/${subdir}/${pname}"
807   #updatecmd ${uri}/$(updatecmd "${uri}"/?C=N\;O=D | grep '[0-9]\.[0-9]*[02468]/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')/?C=M\;O=A | lasttarball "${archive}"   if [[ ${UP2OPTS} = unstable ]]
808   updatecmd ${uri}/$(updatecmd -source ${uri}'?C=M;O=A' | grep ${pname} |tail -n1 | sed -e 's/<\/a>.*//;s/.*>//') | lasttarball ${archive}   then
809     #updatecmd ${uri}/$(updatecmd "${uri}"/?C=N\;O=D | grep '[0-9]\.[0-9]/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')/?C=M\;O=A | lasttarball "${archive}"
810     updatecmd ${uri}/$(updatecmd -nolist "${uri}" | grep '[0-9]\.[0-9]*[0-9]/' | sed -e 's|.*]\(.*\)/.*|\1|' | upsort_pipe)/ | highesttarball "${archive}"
811     else
812     #updatecmd ${uri}/$(updatecmd "${uri}"/?C=N\;O=D | grep '[0-9]\.[0-9]*[02468]/' | sed -ne 's|.*]\(.*\)/.*|\1|' -e '1 p')/?C=M\;O=A | lasttarball "${archive}"
813     updatecmd ${uri}/$(updatecmd -nolist "${uri}" | grep '[0-9]\.[0-9]*[02468]/' | sed -e 's|.*]\(.*\)/.*|\1|' | upsort_pipe)/ | highesttarball "${archive}"
814     fi
815  }  }
816    
817  updatecmd_google()  updatecmd_google()
# Line 676  updateme() Line 848  updateme()
848   local PCAT   local PCAT
849   local PVER   local PVER
850   local UP2DATE   local UP2DATE
851     local UP2URI
852   local UP2PVER   local UP2PVER
853   local UP2TARBALL   local UP2TARBALL
854   local UP2SUBDIR   local UP2SUBDIR
# Line 685  updateme() Line 858  updateme()
858   local UP2SEPERATOR   local UP2SEPERATOR
859   local UP2OPTS   local UP2OPTS
860   local UPSTREAM_PVER   local UPSTREAM_PVER
861    #
862   PNAME="$(get_value_from_magefile PNAME ${smage})"  # PNAME="$(get_value_from_magefile PNAME ${smage})"
863   PCATEGORIE="$(get_value_from_magefile PCATEGORIE ${smage})"  # PCATEGORIE="$(get_value_from_magefile PCATEGORIE ${smage})"
864   PCAT="$(get_value_from_magefile PCAT ${smage})"  # PCAT="$(get_value_from_magefile PCAT ${smage})"
865   PVER="$(get_value_from_magefile PVER ${smage})"  # PVER="$(get_value_from_magefile PVER ${smage})"
866   UP2PVER="$(get_value_from_magefile UP2PVER ${smage})"  # UP2PVER="$(get_value_from_magefile UP2PVER ${smage})"
867   UP2TARBALL="$(get_value_from_magefile UP2TARBALL ${smage})"  # UP2TARBALL="$(get_value_from_magefile UP2TARBALL ${smage})"
868   UP2SUBDIR="$(get_value_from_magefile UP2SUBDIR ${smage})"  # UP2SUBDIR="$(get_value_from_magefile UP2SUBDIR ${smage})"
869   UP2SUBSTITUTE="$(get_value_from_magefile UP2SUBSTITUTE ${smage})"  # UP2SUBSTITUTE="$(get_value_from_magefile UP2SUBSTITUTE ${smage})"
870   UP2USERAGENT="$(get_value_from_magefile UP2USERAGENT ${smage})"  # UP2USERAGENT="$(get_value_from_magefile UP2USERAGENT ${smage})"
871   UP2EXCLUDE="$(get_value_from_magefile UP2EXCLUDE ${smage})"  # UP2EXCLUDE="$(get_value_from_magefile UP2EXCLUDE ${smage})"
872   UP2SEPERATOR="$(get_value_from_magefile UP2SEPERATOR ${smage})"  # UP2SEPERATOR="$(get_value_from_magefile UP2SEPERATOR ${smage})"
873   UP2OPTS="$(get_value_from_magefile UP2OPTS ${smage})"  # UP2OPTS="$(get_value_from_magefile UP2OPTS ${smage})"
874     smagesource "${smage}"
875    
876   [[ -z ${UP2PVER} ]] && UP2PVER="${PVER}"   [[ -z ${UP2PVER} ]] && UP2PVER="${PVER}"
877    
# Line 706  updateme() Line 880  updateme()
880   if [[ -z ${UP2DATE} ]]   if [[ -z ${UP2DATE} ]]
881   then   then
882   #echo "\$UP2DATE is empty, skipping ..."   #echo "\$UP2DATE is empty, skipping ..."
883   continue   #continue
884     :
885   fi   fi
886    
887   #echo "UP2DATE=${UP2DATE}"   #echo "UP2DATE=${UP2DATE}"
# Line 734  updateall() Line 909  updateall()
909   local PACKAGE   local PACKAGE
910   local smage   local smage
911   local repo   local repo
912   local UP2DATE_SLEEP_COUNT=15   local UP2DATE_SLEEP_COUNT=0
913   local UP2DATE_SLEEP_TIMEOUT=3   local UP2DATE_SLEEP_TIMEOUT=0
914   local ONLY_PRINT_UPSTREAM=0   local ONLY_PRINT_UPSTREAM=0
915    
916   : ${REPOS="/home/tjoke/svn/smage/trunk/core /home/tjoke/svn/smage/trunk/extras /home/tjoke/svn/smage/trunk/nonfree /home/tjoke/svn/smage/trunk/todo"}   : ${REPOS="/home/tjoke/svn/smage/trunk/core /home/tjoke/svn/smage/trunk/extras /home/tjoke/svn/smage/trunk/nonfree /home/tjoke/svn/smage/trunk/todo"}

Legend:
Removed from v.3111  
changed lines
  Added in v.3112