Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Etc getlogin inconsistent #53

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/tpkg_uploader
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tpkg_upload_url = "http://localhost:3000/uploads/create"
proxy_server = "proxy.local:8080"
##########################################################################

username = Etc.getlogin
username = Etc.getpwuid.name
password = nil
files_to_upload = nil
proxy = ""
Expand Down
4 changes: 2 additions & 2 deletions lib/tpkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4159,7 +4159,7 @@ def download_pkgs(requests, options={})
# log changes of pkgs that were installed/removed
def log_changes(options={})
msg = ""
user = Etc.getlogin || Etc.getpwuid(Process.uid).name
user = Etc.getpwuid.name
newly_installed = removed = []
newly_installed = options[:newly_installed] if options[:newly_installed]
removed = options[:removed] if options[:removed]
Expand All @@ -4178,7 +4178,7 @@ def log_changes(options={})

def send_update_to_server(options={})
request = {"client"=>os.fqdn}
request[:user] = Etc.getlogin || Etc.getpwuid(Process.uid).name
request[:user] = Etc.getpwuid.name
request[:tpkg_home] = ENV['TPKG_HOME']

if options[:currently_installed]
Expand Down
2 changes: 1 addition & 1 deletion lib/tpkg/deployer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def initialize(options = nil)
@max_worker = 4
@abort_on_failure = false
@use_ssh_key = false
@user = Etc.getlogin
@user = Etc.getpwuid.name
@password = nil
unless options.nil?
@user = options["deploy-as"] unless options["deploy-as"].nil?
Expand Down
2 changes: 1 addition & 1 deletion lib/tpkg/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class Tpkg
VERSION = '2.3.6'
VERSION = '2.3.7'
end