Skip to content

Commit

Permalink
Fixed a few typos, using grep instead of cat|grep
Browse files Browse the repository at this point in the history
  • Loading branch information
Clement Lefebvre committed Mar 29, 2010
1 parent 8b96bad commit 4d60388
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
mintsystem (7.6.7) isadora; urgency=low

* Changed cat | grep to grep, and fixed a typo in the adjustment system.

-- Clement Lefebvre <root@linuxmint.com> Mon, 29 Mar 2010 14:57:00 +0000

mintsystem (7.6.6) isadora; urgency=low

* Added hold, unhold, held commands to apt
Expand Down
14 changes: 7 additions & 7 deletions usr/lib/linuxmint/mintSystem/mint-adjust.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,19 @@ def log (string):
if (config['restore']['lsb-release'] == "True"):
if os.path.exists("/etc/lsb-release"):
lsbfile = open("/etc/lsb-release", "w")
if (commands.getoutput("cat /etc/linuxmint/info | grep DISTRIB_ID").strip() != ""):
lsbfile.writelines(commands.getoutput("cat /etc/linuxmint/info | grep DISTRIB_ID") + "\n")
if (commands.getoutput("grep DISTRIB_ID /etc/linuxmint/info").strip() != ""):
lsbfile.writelines(commands.getoutput("grep DISTRIB_ID /etc/linuxmint/info") + "\n")
else:
lsbfile.writelines("DISTRIB_ID=LinuxMint\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("cat /etc/linuxmint/info | grep RELEASE") + "\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("cat /etc/linuxmint/info | grep CODENAME") + "\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("cat /etc/linuxmint/info | grep DESCRIPTION") + "\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("grep \"RELEASE=\" /etc/linuxmint/info") + "\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("grep CODENAME /etc/linuxmint/info") + "\n")
lsbfile.writelines("DISTRIB_" + commands.getoutput("grep DESCRIPTION /etc/linuxmint/info") + "\n")
lsbfile.close()
log("/etc/lsb-release overwritten")

# Restore /etc/issue and /etc/issue.net
if (config['restore']['etc-issue'] == "True"):
issue = commands.getoutput("cat /etc/linuxmint/info | grep DESCRIPTION").replace("DESCRIPTION=", "").replace("\"", "")
issue = commands.getoutput("grep DESCRIPTION /etc/linuxmint/info").replace("DESCRIPTION=", "").replace("\"", "")
if os.path.exists("/etc/issue"):
issuefile = open("/etc/issue", "w")
issuefile.writelines(issue + " \\n \\l")
Expand All @@ -119,6 +119,6 @@ def log (string):
print detail
log(detail)

log("minSystem stopped")
log("mintSystem stopped")
logfile.close()

0 comments on commit 4d60388

Please sign in to comment.