Magellan Linux

Diff of /trunk/installer/ncurses-gui/usermanagement.sh

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

revision 1034 by niro, Sun May 30 18:27:24 2010 UTC revision 1035 by niro, Sun May 30 18:37:54 2010 UTC
# Line 2  Line 2 
2    
3  root_password_dialog()  root_password_dialog()
4  {  {
  #ROOT_PASSWORD=$(passwordbox "root" "Enter a password for root:" 10 50)  
  #ROOT_PASSWORD_RETYPE=$(passwordbox "root" "Re-enter the password:" 10 50)  
5   dialog \   dialog \
6   --stdout \   --stdout \
7   --colors \   --colors \
# Line 18  root_password_dialog() Line 16  root_password_dialog()
16    
17  add_user_dialog()  add_user_dialog()
18  {  {
  #USER_NAME=$(inputbox "Create a user" "Please enter a username for daily use:" 10 50)  
  #if [[ ! -z ${USER_NAME} ]]  
  #then  
  # USER_PASSWORD=$(passwordbox "${USER_NAME}" "Enter a password for '${USER_NAME}':" 10 50)  
  # USER_PASSWORD_RETYPE=$(passwordbox "${USER_NAME}" "Enter a password for '${USER_NAME}':" 10 50)  
  #fi  
   
19   dialog \   dialog \
20   --stdout \   --stdout \
21   --colors \   --colors \
# Line 59  check_password() Line 50  check_password()
50    
51  rundialog_root_password_dialog()  rundialog_root_password_dialog()
52  {  {
 # root_password_dialog  
 # case $? in  
 # -1) die "Error!" ;;  
 # 255) die "aborted by user" ;;  
 #  
 # 1)  
 # root_password_dialog  
 # ;;  
 #  
 # 0)  
 # export ROOT_PASSWORD  
 # if ! check_password "${ROOT_PASSWORD}" "${ROOT_PASSWORD_RETYPE}"  
 # then  
 # rundialog_root_password_dialog  
 # fi  
 # ;;  
 # esac  
   
53   local ROOT_USER_SETUP   local ROOT_USER_SETUP
54   ROOT_USER_SETUP=($(root_password_dialog))   ROOT_USER_SETUP=($(root_password_dialog))
55   case $? in   case $? in
# Line 88  rundialog_root_password_dialog() Line 61  rundialog_root_password_dialog()
61   ;;   ;;
62    
63   0)   0)
  #export ROOT_PASSWORD  
  #if ! check_password "${ROOT_PASSWORD}" "${ROOT_PASSWORD_RETYPE}"  
  #then  
  # rundialog_root_password_dialog  
  #fi  
   
64   # root username is array item 0!   # root username is array item 0!
65   ROOT_PASSWORD="${ROOT_USER_SETUP[1]}"   ROOT_PASSWORD="${ROOT_USER_SETUP[1]}"
66   ROOT_PASSWORD_RETYPE="${ROOT_USER_SETUP[2]}"   ROOT_PASSWORD_RETYPE="${ROOT_USER_SETUP[2]}"
# Line 116  rundialog_root_password_dialog() Line 83  rundialog_root_password_dialog()
83    
84  rundialog_add_user_dialog()  rundialog_add_user_dialog()
85  {  {
 # add_user_dialog  
 # case $? in  
 # -1) die "Error!" ;;  
 # 255) die "aborted by user" ;;  
 #  
 # 1)  
 # rundialog_root_password_dialog  
 # rundialog_add_user_dialog  
 # ;;  
 #  
 # 0)  
 # export USER_NAME  
 # export USER_PASSWORD  
 # if [[ -z ${USER_NAME} ]]  
 # then  
 # messagebox "Warning" "No username given!" 10 40  
 # rundialog_add_user_dialog  
 # fi  
 # if ! check_password "${USER_PASSWORD}" "${USER_PASSWORD_RETYPE}"  
 # then  
 # rundialog_add_user_dialog  
 # fi  
 # ;;  
 # esac  
   
86   local USER_SETUP   local USER_SETUP
87   USER_SETUP=($(add_user_dialog))   USER_SETUP=($(add_user_dialog))
88   case $? in   case $? in
# Line 153  rundialog_add_user_dialog() Line 95  rundialog_add_user_dialog()
95   ;;   ;;
96    
97   0)   0)
 # export USER_NAME  
 # export USER_PASSWORD  
 # if [[ -z ${USER_NAME} ]]  
 # then  
 # messagebox "Warning" "No username given!" 10 40  
 # rundialog_add_user_dialog  
 # fi  
 # if ! check_password "${USER_PASSWORD}" "${USER_PASSWORD_RETYPE}"  
 # then  
 # rundialog_add_user_dialog  
 # fi  
   
98   USER_NAME="${USER_SETUP[0]}"   USER_NAME="${USER_SETUP[0]}"
99   USER_PASSWORD="${USER_SETUP[1]}"   USER_PASSWORD="${USER_SETUP[1]}"
100   USER_PASSWORD_RETYPE="${USER_SETUP[2]}"   USER_PASSWORD_RETYPE="${USER_SETUP[2]}"

Legend:
Removed from v.1034  
changed lines
  Added in v.1035