Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r469 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2009-01-22 22:38:09
|
Author: M0...@gm...
Date: Thu Jan 22 13:30:05 2009
New Revision: 469
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/installer.gambas
Log:
attempt to fix user import account face icon issue
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jan 22 13:30:05 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/iVL/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Jan 22 13:30:05 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.28
+Version=0.1.21
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/home/uel/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Address=M0...@gm...
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Thu Jan 22 13:30:05 2009
@@ -100,7 +100,7 @@
ME.cbAccntList.Sorted = TRUE
'RETURN
IF ME.CREATE_IMPORTED_ACCOUNT(SaCC) > 0 THEN
- Message.Error(("User Unable to restore user account."))
+ Message.Error(("Unable to restore user account for") & Space(1) &
SaCC)
RETURN
ELSE
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
@@ -129,7 +129,7 @@
DIM tl AS TextLabel
DIM iTlY AS Integer
DIM hproc AS Process
-
+ sname = Trim(ME.cbAccntList.Text)
'Message(sname)
' Prepare group list
@@ -166,18 +166,21 @@
IF hproc.Value > 0 THEN RETURN hproc.Value
IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
' Add the face icon
- IF Len(ME.tbPicPath.Text) > 0 THEN
- IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face")
THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face"
- IF Exist(sPicdir &/ sname & ".face.icon") THEN KILL sPicdir &/
sname & ".face.icon"
+ 'IF Len(ME.tbPicPath.Text) > 0 THEN
+ IF ME.tbPicPath.Text THEN
+ 'IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face")
THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face"
+ EXEC ["rm", "-rf", clsglobal.sTargetMnt &/ "home" &/ Trim(sname)
&/ ".face"] WAIT
+ EXEC ["rm", "-rf", sPicdir &/ Trim(sname) & ".face.icon"] WAIT
+ 'IF Exist(sPicdir &/ sname & ".face.icon") THEN KILL sPicdir &/
sname & ".face.icon"
SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname
& ".face.icon" WAIT 'link for KDM
'shell "cd " & sPicdir & " && ln -s " &
Replace(me.tbPicPath.Text, clsglobal.sTargetMnt, "") & Space(1) &
' Tweak for the GDM face icon to work
' TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ sname &/ ".face"
- EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/
sname &/ ".face"] WAIT ' icon for GDM login
- EXEC ["chmod", "664", clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face"] WAIT
+ EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/
Trim(sname) &/ ".face"] WAIT ' icon for GDM login
+ EXEC ["chmod", "664", clsglobal.sTargetMnt &/ "home" &/ Trim(sname)
&/ ".face"] WAIT
'SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname
&/ ".face" WAIT
- SHELL "chroot " & ClsGlobal.sTargetMnt & " chown -R " & sname &
Space(1) &/ "home" &/ sname WAIT
- SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp -R " & sname &
Space(1) &/ "home/" & sname WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown -R " &
Trim(sname) & Space(1) &/ "home" &/ sname WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp -R " &
Trim(sname) & Space(1) &/ "home/" & sname WAIT
IF ERROR THEN Message.Error(Error.Where & gb.NewLine &
Error.Text)
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
