Commits

Moises Henriquez committed 51aa177

fixing packagename splitting and matching bug

  • Participants
  • Parent commits 459583a

Comments (0)

Files changed (92)

File VL-7.0/.gambas/CONF0

Binary file modified.

File VL-7.0/.gambas/CONF1

Binary file modified.

File VL-7.0/.gambas/CONF2

Binary file modified.

File VL-7.0/.gambas/CONF3

Binary file modified.

File VL-7.0/.gambas/CONF3A

Binary file modified.

File VL-7.0/.gambas/FDONE

Binary file modified.

File VL-7.0/.gambas/FMAIN

Binary file modified.

File VL-7.0/.gambas/FMAIN0

Binary file modified.

File VL-7.0/.gambas/FRMHELP

Binary file modified.

File VL-7.0/.gambas/FRMUSEPARTITION

Binary file modified.

File VL-7.0/.gambas/MAIN

Binary file modified.

File VL-7.0/.gambas/MDLAUTOPARTITION

Binary file modified.

File VL-7.0/.gambas/MDLBOOTMNGR

Binary file modified.

File VL-7.0/.gambas/MDLHELPSYSTEM

Binary file modified.

File VL-7.0/.gambas/MDLINSTALL

Binary file modified.

File VL-7.0/.gambas/MDLMAIN

Binary file modified.

File VL-7.0/.gambas/MDLSTARTUP

Binary file modified.

File VL-7.0/.gambas/STEP0

Binary file modified.

File VL-7.0/.gambas/STEP1

Binary file modified.

File VL-7.0/.gambas/STEP2

Binary file modified.

File VL-7.0/.gambas/STEP3

Binary file modified.

File VL-7.0/.gambas/STEP3A1

Binary file modified.

File VL-7.0/.gambas/STEP3A1A

Binary file modified.

File VL-7.0/.gambas/STEP3A2

Binary file modified.

File VL-7.0/.gambas/STEP3A3

Binary file modified.

File VL-7.0/.gambas/STEP3A3A

Binary file modified.

File VL-7.0/.gambas/STEP5

Binary file modified.

File VL-7.0/.gambas/STEP6

Binary file modified.

File VL-7.0/.gambas/STEP7

Binary file modified.

File VL-7.0/.gambas/STEP7A

Binary file modified.

File VL-7.0/.gambas/STEP7B

Binary file modified.

File VL-7.0/.gambas/STEP7C

Binary file modified.

File VL-7.0/.gambas/STEP8

Binary file modified.

File VL-7.0/.gambas/STEP9

Binary file modified.

File VL-7.0/.lang/BootMenuEntry.pot

-# /root/speedy/BootMenuEntry.class
+# /mnt/hd/vinstall-gambas/VL-7.0/BootMenuEntry.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/BootMenuSettings.pot

-# /root/speedy/BootMenuSettings.class
+# /mnt/hd/vinstall-gambas/VL-7.0/BootMenuSettings.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Bulk.pot

-# /root/speedy/Bulk.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Bulk.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/ClsGlobal.pot

-# /root/speedy/ClsGlobal.class
+# /mnt/hd/vinstall-gambas/VL-7.0/ClsGlobal.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf0.pot

-# /root/speedy/Conf0.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf0.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf1.pot

-# /root/speedy/Conf1.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf1.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf2.pot

-# /root/speedy/Conf2.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf2.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf3.pot

-# /root/speedy/Conf3.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf3.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf3a.pot

-# /root/speedy/Conf3a.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf3a.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf4.pot

-# /root/speedy/Conf4.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf4.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Conf5.pot

-# /root/speedy/Conf5.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Conf5.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FDone.pot

-# /root/speedy/FDone.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FDone.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FMain.pot

-# /root/speedy/FMain.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FMain.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FMain0.pot

-# /root/speedy/FMain0.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FMain0.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FrmHelp.pot

-# /root/speedy/FrmHelp.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FrmHelp.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FrmRestart.pot

-# /root/speedy/FrmRestart.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FrmRestart.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FrmUsePartition.pot

-# /root/speedy/FrmUsePartition.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FrmUsePartition.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/FrmUsrList.pot

-# /root/speedy/FrmUsrList.class
+# /mnt/hd/vinstall-gambas/VL-7.0/FrmUsrList.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/InstallSrc.pot

-# /root/speedy/InstallSrc.class
+# /mnt/hd/vinstall-gambas/VL-7.0/InstallSrc.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Installation.pot

-# /root/speedy/Installation.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Installation.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Main.pot

-# /root/speedy/Main.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Main.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlAutoPartition.pot

-# /root/speedy/MdlAutoPartition.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlAutoPartition.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlBootMngr.pot

-# /root/speedy/MdlBootMngr.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlBootMngr.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlHelpSystem.pot

-# /root/speedy/MdlHelpSystem.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlHelpSystem.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlInstall.pot

-# /root/speedy/MdlInstall.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlInstall.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlMain.pot

-# /root/speedy/MdlMain.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlMain.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlObjSizer.pot

-# /root/speedy/MdlObjSizer.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlObjSizer.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/MdlStartUp.pot

-# /root/speedy/MdlStartUp.module
+# /mnt/hd/vinstall-gambas/VL-7.0/MdlStartUp.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Package.pot

-# /root/speedy/Package.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Package.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Partition.pot

-# /root/speedy/Partition.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Partition.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Partitioner.pot

-# /root/speedy/Partitioner.module
+# /mnt/hd/vinstall-gambas/VL-7.0/Partitioner.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Settings.pot

-# /root/speedy/Settings.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Settings.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step0.pot

-# /root/speedy/Step0.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step0.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step1.pot

-# /root/speedy/Step1.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step1.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step2.pot

-# /root/speedy/Step2.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step2.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3.pot

-# /root/speedy/Step3.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a.pot

-# /root/speedy/Step3a.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a1.pot

-# /root/speedy/Step3a1.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a1.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a1a.pot

-# /root/speedy/Step3a1a.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a1a.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a2.pot

-# /root/speedy/Step3a2.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a2.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a3.pot

-# /root/speedy/Step3a3.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a3.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step3a3a.pot

-# /root/speedy/Step3a3a.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step3a3a.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step4.pot

-# /root/speedy/Step4.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step4.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step5.pot

-# /root/speedy/Step5.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step5.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step6.pot

-# /root/speedy/Step6.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step6.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step7.pot

-# /root/speedy/Step7.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step7.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step7a.pot

-# /root/speedy/Step7a.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step7a.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step7b.pot

-# /root/speedy/Step7b.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step7b.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step7c.pot

-# /root/speedy/Step7c.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step7c.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step8.pot

-# /root/speedy/Step8.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step8.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/Step9.pot

-# /root/speedy/Step9.class
+# /mnt/hd/vinstall-gambas/VL-7.0/Step9.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/StsMain.pot

-# /root/speedy/StsMain.module
+# /mnt/hd/vinstall-gambas/VL-7.0/StsMain.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/UnitConv.pot

-# /root/speedy/UnitConv.module
+# /mnt/hd/vinstall-gambas/VL-7.0/UnitConv.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.lang/_SettingsKeys.pot

-# /root/speedy/_SettingsKeys.class
+# /mnt/hd/vinstall-gambas/VL-7.0/_SettingsKeys.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

File VL-7.0/.project

 # Compiled with Gambas 2.22.0
 Title=VectorLinux Installer
 Startup=MdlStartUp
-Version=1.0.1
+Version=1.0.2
 Library=gb.gtk
 Library=gb.form
 Library=gb.desktop

File VL-7.0/.settings

 SearchString=True
 
 [OpenFile]
-File[1]="Conf0.form"
-File[2]="Conf0.class:201.25"
-Active=2
-Count=2
+File[1]="MdlMain.module:1883.4"
+Active=1
+Count=1
 
 [Watches]
 Count=0

File VL-7.0/MdlMain.module

   DIM sNameArr, sList AS String[]
   DIM sPkg, sTlzName, sShortName, sParentDir AS String
   DIM sDump, sDump1, sRetval AS String
+  DIM item AS String
   DIM i, ii AS Integer
 
   IF Exist(Temp("pkgpaths")) = FALSE THEN 
         'PRINT "Found possibel match " & sPkg & " in " & sParentDir
           ' now find out if the left of the string is the same as the package name and it is a hit for what we are looking for.
           sNameArr = Split(sPkg, "-")
-          FOR ii = 0 TO (sNameArr.Count - 4)
-            sTlzName = sTlzName & sNameArr[ii] & "-"
-          NEXT 
-            sTlzName = Left(Trim(sTlzName), Len(Trim(sTlzName)) - 1)
+          sNameArr.Delete(sNameArr.Max) ' Take out the '1vl?0.t?z' part of the array
+          sNameArr.Delete(sNameArr.Max) ' take out the arch part of the array (noarch)
+          sNameArr.Delete(sNameArr.Max) ' take out the pkg version part of the array
+          sTlzName = sNameArr.Join("-")
+          'FOR ii = 0 TO (sNameArr.Count - 4)
+          '  sTlzName = sTlzName & sNameArr[ii] & "-"
+          'NEXT 
+           ' sTlzName = Left(Trim(sTlzName), Len(Trim(sTlzName)) - 1)
             'PRINT sTlzName
             IF Trim(sTlzName) = sPkgname THEN
               sRetval = sList[i] 'sParentDir &/ sPkg 'Trim(sTlzName)

File VL-7.0/vinstall-ng.gambas

Binary file modified.