Bob Mottram 8 years ago
parent
commit
11ce88a8e5
1 changed files with 9 additions and 9 deletions
  1. 9
    9
      src/freedombone-controlpanel

+ 9
- 9
src/freedombone-controlpanel View File

36
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
36
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
37
 for f in $UTILS_FILES
37
 for f in $UTILS_FILES
38
 do
38
 do
39
-  source $f
39
+    source $f
40
 done
40
 done
41
 
41
 
42
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
42
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
43
 for f in $APP_FILES
43
 for f in $APP_FILES
44
 do
44
 do
45
-  source $f
45
+    source $f
46
 done
46
 done
47
 
47
 
48
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
48
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
161
 
161
 
162
 function view_or_change_passwords {
162
 function view_or_change_passwords {
163
     passwords_select_user
163
     passwords_select_user
164
-    if [ ! $SELECTED_USER ]; then
164
+    if [ ! $SELECTED_USERNAME ]; then
165
         return
165
         return
166
     fi
166
     fi
167
     detect_installed_apps
167
     detect_installed_apps
170
         return
170
         return
171
     fi
171
     fi
172
 
172
 
173
-    CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USER} -a ${SELECTED_APP})
173
+    CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP})
174
 
174
 
175
     data=$(tempfile 2>/dev/null)
175
     data=$(tempfile 2>/dev/null)
176
     trap "rm -f $data" 0 1 2 5 15
176
     trap "rm -f $data" 0 1 2 5 15
183
             CURR_PASSWORD=$(<$data)
183
             CURR_PASSWORD=$(<$data)
184
             if [ ${#CURR_PASSWORD} -gt 8 ]; then
184
             if [ ${#CURR_PASSWORD} -gt 8 ]; then
185
                 if [[ $(function_exists change_password_${SELECTED_APP}) == "1" ]]; then
185
                 if [[ $(function_exists change_password_${SELECTED_APP}) == "1" ]]; then
186
-                    ${PROJECT_NAME}-pass -u ${SELECTED_USER} -a ${SELECTED_APP} -p ${CURR_PASSWORD}
187
-                    change_password_${SELECTED_APP} ${SELECTED_USER} "${CURR_PASSWORD}"
186
+                    ${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP} -p ${CURR_PASSWORD}
187
+                    change_password_${SELECTED_APP} ${SELECTED_USERNAME} "${CURR_PASSWORD}"
188
                     dialog --title $"Change password" \
188
                     dialog --title $"Change password" \
189
                            --msgbox $"The password was changed" 6 40
189
                            --msgbox $"The password was changed" 6 40
190
                 fi
190
                 fi
1875
     appnames+=("Exit")
1875
     appnames+=("Exit")
1876
 
1876
 
1877
     choice=$(dialog --stdout --backtitle $"Freedombone" \
1877
     choice=$(dialog --stdout --backtitle $"Freedombone" \
1878
-                     --title $"Change Settings for an App" \
1879
-                     --radiolist $'Choose:' \
1880
-                     16 40 20 $applist)
1878
+                    --title $"Change Settings for an App" \
1879
+                    --radiolist $'Choose:' \
1880
+                    16 40 20 $applist)
1881
 
1881
 
1882
     if [ $? -eq 0 ]; then
1882
     if [ $? -eq 0 ]; then
1883
         app_index=$[choice-1]
1883
         app_index=$[choice-1]