Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity

fixed building; fixed commands

Browse Source
pull/299/head
Ivan Dmitrievich Yartsev 2 months ago
parent b7f7009155
commit a21d9eef1b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
source/ubinstall-gtk-bootloader.c
Unescape View File

@ -10,7 +10,6 @@ int yon_bootloader_save(main_window *widgets){
{ {
int size; int size;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size);
char *admins = config(GRUB_SUPERUSERS_parameter);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
char *parameter = yon_char_divide_search(users[i],"=",-1); char *parameter = yon_char_divide_search(users[i],"=",-1);
yon_config_remove_by_key(parameter); yon_config_remove_by_key(parameter);
@ -21,8 +20,6 @@ int yon_bootloader_save(main_window *widgets){
} }
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootloadUsersList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootloadUsersList);
int admin_size=0;
config_str admin_list = NULL;
for_iter(model,&iter){ for_iter(model,&iter){
int is_admin; int is_admin;
char *username, *password; char *username, *password;

9
source/ubinstall-gtk.h
Unescape View File

@ -152,8 +152,8 @@ layout && /description:/ {\
#define enable_vnc_command "ubconfig --target system set [desktop] X11VNC[password]=ublinux" #define enable_vnc_command "ubconfig --target system set [desktop] X11VNC[password]=ublinux"
#define disable_vnc_command "ubconfig --target system remove [desktop] X11VNC[password]" #define disable_vnc_command "ubconfig --target system remove [desktop] X11VNC[password]"
#define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC++=freerdp-server.serv" #define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC++=freerdp-server.service"
#define disable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC--=freerdp-server.serv" #define disable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC--=freerdp-server.service"
#define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"", layout, "\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u", NULL) #define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"", layout, "\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u", NULL)
// #define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7" // #define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7"
@ -242,17 +242,18 @@ layout && /description:/ {\
#define GRUB_DEFAULT_parameter "AUTOINSTALL[ubconfig set [boot] GRUB_DEFAULT]" #define GRUB_DEFAULT_parameter "AUTOINSTALL[ubconfig set [boot] GRUB_DEFAULT]"
#define GRUB_DEFAULT_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_DEFAULT']" #define GRUB_DEFAULT_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_DEFAULT']"
#define GRUB_PASSWORD_parameter_search "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[" #define GRUB_PASSWORD_parameter_search "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD["
#define GRUB_PASSWORD_parameter_all "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[*]]" #define GRUB_PASSWORD_parameter_all "AUTOINSTALL[\"ubconfig set [boot] GRUB_PASSWORD[*]\"]"
#define GRUB_PASSWORD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[", target, "]]", NULL) #define GRUB_PASSWORD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[", target, "]]", NULL)
#define GRUB_PASSWORD_parameter_command_all "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[*]']" #define GRUB_PASSWORD_parameter_command_all "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[*]']"
#define GRUB_PASSWORD_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[", target, "]']", NULL) #define GRUB_PASSWORD_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[", target, "]']", NULL)
#define AUTOLOGINUSER_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOLOGINUSER]" #define AUTOLOGINUSER_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOLOGINUSER]"
#define AUTOLOGINUSER_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] AUTOLOGINUSER']" #define AUTOLOGINUSER_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] AUTOLOGINUSER']"
#define NETWORK_parameter_all "AUTOINSTALL[\"ubconfig set [network] NETWORK[*]\"]"
#define NETWORK_parameter_search "AUTOINSTALL[ubconfig set [network] NETWORK[" #define NETWORK_parameter_search "AUTOINSTALL[ubconfig set [network] NETWORK["
#define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@connmod]]", NULL) #define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@connmod]]", NULL)
#define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@devdown]]", NULL) #define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@devdown]]", NULL)
#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@connmod]']", NULL)
#define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@devdown]']", NULL) #define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@devdown]']", NULL)
#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@connmod]']", NULL)
#define NETWORK(target) yon_char_unite("NETWORK[", target, "@connmod]", NULL) #define NETWORK(target) yon_char_unite("NETWORK[", target, "@connmod]", NULL)
#define installer_locale_parameter "AUTOINSTALL[installer_locale]" #define installer_locale_parameter "AUTOINSTALL[installer_locale]"
#define installer_locale_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[installer_locale]" #define installer_locale_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[installer_locale]"

Write Preview
Loading…
Cancel
Save