Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
12 kB · 207 lines
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.inindex cbecde4..ea5d3cc 100755--- a/frontend/linux/workbench/mysql-workbench.in+++ b/frontend/linux/workbench/mysql-workbench.in@@ -100,8 +100,8 @@ fi if test "$WB_DEBUG" != ""; then $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" else- if type -p catchsegv > /dev/null; then- catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"+ if type -p @catchsegv@ > /dev/null; then+ @catchsegv@ $MWB_BINARIES_DIR/mysql-workbench-bin "$@" else $MWB_BINARIES_DIR/mysql-workbench-bin "$@" fidiff --git a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/migration/frontend/migration_bulk_copy_data.pyindex da6aa9f..9f4fe78 100644--- a/plugins/migration/frontend/migration_bulk_copy_data.py+++ b/plugins/migration/frontend/migration_bulk_copy_data.py@@ -111,7 +111,7 @@ class ImportScriptLinux(ImportScript): return 'sh' def generate_import_script(self, connection_args, path_to_file, schema_name):- output = ['#!/bin/bash']+ output = ['#!/usr/bin/env bash'] output.append(r'MYPATH=\`pwd\`') output.append(r'if [ -f \$MYPATH/%s ] ; then' % self.error_log_name)@@ -165,7 +165,7 @@ class ImportScriptDarwin(ImportScript): return 'sh' def generate_import_script(self, connection_args, path_to_file, schema_name):- output = ['#!/bin/bash']+ output = ['#!/usr/bin/env bash'] output.append(r'MYPATH=\`pwd\`') output.append(r'if [ -f \$MYPATH/%s ] ; then' % self.error_log_name)@@ -418,7 +418,7 @@ class DataCopyScriptLinux(DataCopyScript): with open(script_path, 'w+') as f: os.chmod(script_path, 0o700)- f.write('#!/bin/bash\n\n')+ f.write('#!/usr/bin/env bash\n\n') f.write('MYPATH=`pwd`\n') f.write("arg_source_password=\"<put source password here>\"\n")@@ -522,7 +522,7 @@ class DataCopyScriptDarwin(DataCopyScript): with open(script_path, 'w+') as f: os.chmod(script_path, 0o700)- f.write('#!/bin/bash\n\n')+ f.write('#!/usr/bin/env bash\n\n') f.write('MYPATH=`pwd`\n') f.write("arg_source_password=\"<put source password here>\"\n")diff --git a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/backend/wb_server_control.pyindex 353f461..f7daa9e 100644--- a/plugins/wb.admin/backend/wb_server_control.py+++ b/plugins/wb.admin/backend/wb_server_control.py@@ -40,7 +40,7 @@ import re UnixVariant = { "" : {- 'sudo_command' : "/usr/bin/sudo -k -S -p EnterPasswordHere ",+ 'sudo_command' : "@sudo@ -k -S -p EnterPasswordHere ", } } diff --git a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.pyindex 40ed515..00da327 100644--- a/plugins/wb.admin/backend/wb_server_management.py+++ b/plugins/wb.admin/backend/wb_server_management.py@@ -41,7 +41,7 @@ default_sudo_prefix = '' def reset_sudo_prefix(): global default_sudo_prefix- default_sudo_prefix = '/usr/bin/sudo -k -S -p EnterPasswordHere'+ default_sudo_prefix = '@sudo@ -k -S -p EnterPasswordHere' reset_sudo_prefix() @@ -101,7 +101,7 @@ def wrap_for_sudo(command, sudo_prefix, as_user = Users.ADMIN, to_spawn = False) if to_spawn: command += ' &'- sudo_prefix += ' /usr/bin/nohup'+ sudo_prefix += ' @coreutils@/bin/nohup' # If as_user is the CURRENT then there's no need to sudo if as_user != Users.CURRENT:@@ -112,7 +112,7 @@ def wrap_for_sudo(command, sudo_prefix, as_user = Users.ADMIN, to_spawn = False) if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" else:- command = "LANG=C " + sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\""+ command = "LANG=C " + sudo_prefix + " @bash@ -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" return command @@ -879,9 +879,9 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def get_file_owner(self, path, as_user = Users.CURRENT, user_password = None): if self.target_os == wbaOS.linux:- command = 'LC_ALL=C stat -c %U '+ command = 'LC_ALL=C @coreutils@/bin/stat -c %U ' else:- command = 'LC_ALL=C /usr/bin/stat -f "%Su" '+ command = 'LC_ALL=C @coreutils@/bin/stat -f "%Su" ' output = io.StringIO() command = command + quote_path(path)@@ -905,9 +905,9 @@ class FileOpsLinuxBase(object): if as_user == Users.CURRENT: raise PermissionDeniedError("Cannot set owner of directory %s" % path) else:- command = "/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path))+ command = "@coreutils@/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) else:- command = "/bin/mkdir %s" % (quote_path(path))+ command = "@coreutils@/bin/mkdir %s" % (quote_path(path)) res = self.process_ops.exec_cmd(command, as_user = as_user,@@ -936,7 +936,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO()- res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path),+ res = self.process_ops.exec_cmd('@coreutils@/bin/rmdir ' + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write,@@ -949,7 +949,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO()- res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path),+ res = self.process_ops.exec_cmd('@coreutils@/bin/rm -R ' + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write,@@ -962,7 +962,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def delete_file(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO()- res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path),+ res = self.process_ops.exec_cmd("@coreutils@/bin/rm " + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write,@@ -1010,7 +1010,7 @@ class FileOpsLinuxBase(object): def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): output = io.StringIO() - res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest),+ res = self.process_ops.exec_cmd("LC_ALL=C @coreutils@/bin/cp " + quote_path(source) + " " + quote_path(dest), as_user = as_user, user_password = user_password, output_handler = output.write,@@ -1086,9 +1086,9 @@ class FileOpsLinuxBase(object): # for ls -l, the output format changes depending on stdout being a terminal or not # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) # the good news is that if the line is there, then it will always start with total, regardless of the locale- command = 'LC_ALL=C /bin/ls -l -p %s' % quote_path(path)+ command = 'LC_ALL=C @coreutils@/bin/ls -l -p %s' % quote_path(path) else:- command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path)+ command = 'LC_ALL=C @coreutils@/bin/ls -1 -p %s' % quote_path(path) output = io.StringIO() res = self.process_ops.exec_cmd(command,@@ -2164,9 +2164,9 @@ class SudoTailInputFile(object): def get_range(self, start, end): f = io.StringIO() if not self._need_sudo:- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write)+ ret = self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) else:- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write)+ ret = self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) if ret != 0: raise RuntimeError("Could not get data from file %s" % self.path)@@ -2174,9 +2174,9 @@ class SudoTailInputFile(object): def read_task(self, offset, file): if not self._need_sudo:- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write)+ self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) else:- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write)+ self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) # this will signal the reader end that there's no more data file.close() @@ -2203,9 +2203,9 @@ class SudoTailInputFile(object): self._pos = offset f = io.StringIO() if not self._need_sudo:- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write)+ self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) else:- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write)+ self.server_helper.execute_command("@coreutils@/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) self.data = f self.data.seek(0) if self.skip_first_newline: