Changeset 3233

Timestamp:

Jan 11, 2017, 2:17:16 PM (4 years ago)

Author:

daduve

Message:

Bug to show mirror fixed

Location:

lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky

Files:

• conkyrc_gui (modified) (3 diffs)
• lliurex-conky (modified) (1 diff)

lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui

@@ -114 +114 @@
         touch $FICHERO
 
-        VERSION=$(find /net/mirror/llx1505/pool/main/l/lliurex-meta -name 'lliurex-cdd_*386.deb' | head -1 )
+        VERSION=$(find /net/mirror/llx16/pool/main/l/lliurex-version-timestamp -name 'lliurex-version-timestamp_*386.deb' | head -1 )
 
         if [ -n "$VERSION" ]; then 
                         
-                        NUMERO_32=$(echo ${VERSION%%_i386.deb}| cut -d_ -f2 )
+                        NUMERO_32=$(echo $VERSION | cut -d_ -f2 )
                         echo 'VERSION 32 BITS:' $NUMERO_32 >> $FICHERO
                         
         fi
 
-        VERSION=$(find /net/mirror/llx1505/pool/main/l/lliurex-meta -name 'lliurex-cdd_*amd64.deb' | head -1 )
+        VERSION=$(find /net/mirror/llx16/pool/main/l/lliurex-version-timestamp -name 'lliurex-version-timestamp_*amd64.deb' | head -1)
 
         if [ -n "$VERSION" ]; then 
                         
-                        NUMERO_64=$(echo ${VERSION%%_amd64.deb}| cut -d_ -f2 )
+                        NUMERO_64=$(echo $VERSION | cut -d_ -f2 )
                         echo 'VERSION 64 BITS:' $NUMERO_64 >> $FICHERO
                         
@@ -382 +382 @@
         rm $CONKYRC_USED
         cp $CONKYRC_ADMIN_BASE $CONKYRC_USED
-        #echo "">>$CONKYRC_USED
+        echo "" >>$CONKYRC_USED
         
         
@@ -405 +405 @@
         if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION':${exec lliurex-version | awk -F '\',\'' '\'{print \$3}\''}' >> $CONKYRC_USED;fi
         if [[ $SELECTION == *MIRROR_VERSION* ]] ; then
-                if  ( rgrep 32 /tmp/mirror.txt ) || ( rgrep 64 /tmp/mirror.txt) ; then
+                if  ( rgrep 32 /tmp/mirror_version.txt ) || ( rgrep 64 /tmp/mirror_version.txt) ; then
                         echo '${if_existing /tmp/mirror_version.txt}${if_match ${exec grep "VERSION 32" /tmp/mirror_version.txt -c}!=0}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template9}${else}${template8 32}${endif}${else}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template8 64}${endif}${endif}${endif}' >> $CONKYRC_USED
                 fi

lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/lliurex-conky

@@ -86 +86 @@
         touch $FICHERO
 
-        VERSION=$(find /net/mirror/llx1505/pool/main/l/lliurex-meta -name 'lliurex-cdd_*386.deb' | sort -r | head -1 )
+        VERSION=$(find /net/mirror/llx16/pool/main/l/lliurex-version-timestamp -name 'lliurex-version-timestamp_*386.deb' | head -1 )
 
         if [ -n "$VERSION" ]; then 
                         
-                        NUMERO_32=$(echo ${VERSION%%_i386.deb}| cut -d_ -f2 )
+                        NUMERO_32=$(echo $VERSION | cut -d_ -f2 )
                         echo 'VERSION 32 BITS:' $NUMERO_32 >> $FICHERO
                         
         fi
 
-        VERSION=$(find /net/mirror/llx1505/pool/main/l/lliurex-meta -name 'lliurex-cdd_*amd64.deb' | sort -r | head -1 )
+        VERSION=$(find /net/mirror/llx16/pool/main/l/lliurex-version-timestamp -name 'lliurex-version-timestamp_*amd64.deb' | head -1)
 
         if [ -n "$VERSION" ]; then 
                         
-                        NUMERO_64=$(echo ${VERSION%%_amd64.deb}| cut -d_ -f2 )
+                        NUMERO_64=$(echo $VERSION | cut -d_ -f2 )
                         echo 'VERSION 64 BITS:' $NUMERO_64 >> $FICHERO
                         
-        fi      
+        fi
 
 }