PageRenderTime 2416ms CodeModel.GetById 1ms RepoModel.GetById 0ms app.codeStats 0ms

/pcr/packer-git/pur-support.patch

https://gitlab.com/parabola/abslibre_abslibre
Patch | 531 lines | 503 code | 28 blank | 0 comment | 0 complexity | 8818f9d741539da4fadf9dfb1a1c02c6 MD5 | raw file
    

  1. diff -Nur a/packer b/packer
    2. 

  2. --- a/packer	2015-08-28 16:26:27.878307880 -0300
    3. 

  3. +++ b/packer	2015-08-28 16:35:43.554089893 -0300
    4. 

  4. @@ -24,9 +24,9 @@
    5. 

  5.  usermakepkgconf="$HOME/.makepkg.conf"
    6. 

  6.  pacmanconf='/etc/pacman.conf'
    7. 

  7.  
    8. 

  8. -RPCURL="https://aur.archlinux.org/rpc.php?type"
    9. 

  9. -PKGURL="https://aur.archlinux.org"
    10. 

  10. -PKGBURL="https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h"
    11. 

  11. +RPCURL="https://pur.parabola.nu/rpc.php?type"
    12. 

  12. +PKGURL="https://pur.parabola.nu"
    13. 

  13. +PKGBURL="https://pur.parabola.nu/cgit/pur.git/plain/PKGBUILD?h"
    14. 

  14.  
    15. 

  15.  if [[ -t 1 && ! $COLOR = "NO" ]]; then
    16. 

  16.    COLOR1='\e[1;39m'
    17. 

  17. @@ -59,14 +59,14 @@
    18. 

  18.    echo '    -Syu|-Su     - updates all packages, also takes -uu and -yy options'
    19. 

  19.    echo '    -Ss|-Ssq     - searches for package'
    20. 

  20.    echo '    -Si          - outputs info for package'
    21. 

  21. -  echo '    -G           - download and extract aur tarball only'
    22. 

  22. +  echo '    -G           - download and extract pur tarball only'
    23. 

  23.    echo
    24. 

  24.    echo '    --quiet      - only output package name for searches'
    25. 

  25.    echo '    --ignore     - takes a comma-separated list of packages to ignore'
    26. 

  26.    echo '    --noconfirm  - do not prompt for any confirmation'
    27. 

  27.    echo '    --noedit     - do not prompt to edit files'
    28. 

  28.    echo '    --quickcheck - check for updates and exit'
    29. 

  29. -  echo '    --auronly    - only do actions for aur'
    30. 

  30. +  echo '    --puronly    - only do actions for pur'
    31. 

  31.    echo '    --devel      - update devel packages during -Su'
    32. 

  32.    echo '    --skipinteg  - when using makepkg, do not check md5s'
    33. 

  33.    echo '    --preview    - edit pkgbuild before sourcing'
    34. 

  34. @@ -103,8 +103,8 @@
    35. 

  35.    [[ " ${ignoredpackages[@]} " =~ " $1 " ]]
    36. 

  36.  }
    37. 

  37.  
    38. 

  38. -# Tests whether $1 exists on the aur
    39. 

  39. -existsinaur() {
    40. 

  40. +# Tests whether $1 exists on the pur
    41. 

  41. +existsinpur() {
    42. 

  42.    rpcinfo "$1"
    43. 

  43.    [[ "$(jshon -Qe resultcount -u < "$tmpdir/$1.info")" != "0" ]]
    44. 

  44.  }
    45. 

  45. @@ -131,8 +131,8 @@
    46. 

  46.    pacman -Qq -- "$1" &>/dev/null
    47. 

  47.  }
    48. 

  48.  
    49. 

  49. -# Scrapes the aur deps from PKGBUILDS and puts in globally available dependencies array
    50. 

  50. -scrapeaurdeps() {
    51. 

  51. +# Scrapes the pur deps from PKGBUILDS and puts in globally available dependencies array
    52. 

  52. +scrapepurdeps() {
    53. 

  53.    pkginfo "$1" "$preview"
    54. 

  54.    . "$tmpdir/$1.PKGBUILD"
    55. 

  55.    IFS=$'\n'
    56. 

  56. @@ -141,26 +141,26 @@
    57. 

  57.  }
    58. 

  58.  
    59. 

  59.  # Finds dependencies of package $1
    60. 

  60. -# Sets pacmandeps and aurdeps array, which can be accessed globally after function runs
    61. 

  61. +# Sets pacmandeps and purdeps array, which can be accessed globally after function runs
    62. 

  62.  finddeps() {
    63. 

  63. -  # loop through dependencies, if not installed, determine if pacman or aur deps
    64. 

  64. +  # loop through dependencies, if not installed, determine if pacman or pur deps
    65. 

  65.    pacmandeps=()
    66. 

  66. -  aurdeps=()
    67. 

  67. -  scrapeaurdeps "$1"
    68. 

  68. +  purdeps=()
    69. 

  69. +  scrapepurdeps "$1"
    70. 

  70.    missingdeps=( $(pacman -T "${dependencies[@]}") )
    71. 

  71.    while [[ $missingdeps ]]; do
    72. 

  72.      checkdeps=()
    73. 

  73.      for dep in "${missingdeps[@]}"; do
    74. 

  74. -      if [[ " $1 ${aurdeps[@]} ${pacmandeps[@]} " =~ " $dep " ]];  then
    75. 

  75. +      if [[ " $1 ${purdeps[@]} ${pacmandeps[@]} " =~ " $dep " ]];  then
    76. 

  76.          continue
    77. 

  77.        fi
    78. 

  78.        if existsinpacman "$dep"; then
    79. 

  79.          pacmandeps+=("$dep")
    80. 

  80. -      elif existsinaur "$dep"; then
    81. 

  81. -        if [[ $aurdeps ]]; then
    82. 

  82. -          aurdeps=("$dep" "${aurdeps[@]}")
    83. 

  83. +      elif existsinpur "$dep"; then
    84. 

  84. +        if [[ $purdeps ]]; then
    85. 

  85. +          purdeps=("$dep" "${purdeps[@]}")
    86. 

  86.          else
    87. 

  87. -          aurdeps=("$dep")
    88. 

  88. +          purdeps=("$dep")
    89. 

  89.          fi
    90. 

  90.          checkdeps+=("$dep")
    91. 

  91.        elif providedinpacman "$dep"; then
    92. 

  92. @@ -173,7 +173,7 @@
    93. 

  93.      done
    94. 

  94.      missingdeps=()
    95. 

  95.      for dep in "${checkdeps[@]}"; do
    96. 

  96. -      scrapeaurdeps "$dep"
    97. 

  97. +      scrapepurdeps "$dep"
    98. 

  98.        for depdep in "${dependencies[@]}"; do
    99. 

  99.          [[ $(pacman -T "$depdep") ]] && missingdeps+=("$depdep")
    100. 

  100.        done
    101. 

  101. @@ -183,12 +183,12 @@
    102. 

  102.  }
    103. 

  103.  
    104. 

  104.  # Displays a progress bar ($1 is numerator, $2 is denominator, $3 is candy/normal)
    105. 

  105. -aurbar() {
    106. 

  106. +purbar() {
    107. 

  107.    # Delete line
    108. 

  108.    printf "\033[0G"
    109. 

  109.    
    110. 

  110.    # Get vars for output
    111. 

  111. -  beginline=" aur"
    112. 

  112. +  beginline=" pur"
    113. 

  113.    beginbar="["
    114. 

  114.    endbar="] "
    115. 

  115.    perc="$(($1*100/$2))"
    116. 

  116. @@ -252,13 +252,13 @@
    117. 

  117.    fi
    118. 

  118.  }
    119. 

  119.  
    120. 

  120. -# Checks if package is newer on aur ($1 is package name, $2 is local version)
    121. 

  121. -aurversionisnewer() {
    122. 

  122. +# Checks if package is newer on pur ($1 is package name, $2 is local version)
    123. 

  123. +purversionisnewer() {
    124. 

  124.    rpcinfo "$1"
    125. 

  125. -  unset aurversion
    126. 

  126. -  if existsinaur "$1"; then
    127. 

  127. -    aurversion="$(jshon -Q -e results -e Version -u < "$tmpdir/$1.info")"
    128. 

  128. -    if [[ "$(LC_ALL=C vercmp "$aurversion" "$2")" -gt 0  ]]; then
    129. 

  129. +  unset purversion
    130. 

  130. +  if existsinpur "$1"; then
    131. 

  131. +    purversion="$(jshon -Q -e results -e Version -u < "$tmpdir/$1.info")"
    132. 

  132. +    if [[ "$(LC_ALL=C vercmp "$purversion" "$2")" -gt 0  ]]; then
    133. 

  133.        return 0
    134. 

  134.      fi
    135. 

  135.    fi
    136. 

  136. @@ -281,14 +281,14 @@
    137. 

  137.    fi
    138. 

  138.  }
    139. 

  139.  
    140. 

  140. -# Installs packages from aur ($1 is package, $2 is dependency or explicit)
    141. 

  141. -aurinstall() {
    142. 

  142. +# Installs packages from pur ($1 is package, $2 is dependency or explicit)
    143. 

  143. +purinstall() {
    144. 

  144.    dir="${TMPDIR:-/tmp}/packerbuild-$UID/$1"
    145. 

  145.    sourcemakepkgconf
    146. 

  146.  
    147. 

  147.    # Prepare the installation directory
    148. 

  148. -  # If there is an old directory and aurversion is not newer, use old directory
    149. 

  149. -  if . "$dir/$1/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then
    150. 

  150. +  # If there is an old directory and purversion is not newer, use old directory
    151. 

  151. +  if . "$dir/$1/PKGBUILD" &>/dev/null && ! purversionisnewer "$1" "$pkgver-$pkgrel"; then
    152. 

  152.      cd "$dir/$1"
    153. 

  153.    else
    154. 

  154.      [[ -d "$dir" ]] && rm -rf "$dir"
    155. 

  155. @@ -354,15 +354,15 @@
    156. 

  156.    # Figure out all of the packages that need to be installed
    157. 

  157.    for package in "${packageargs[@]}"; do
    158. 

  158.      # Determine whether package is in pacman repos
    159. 

  159. -    if ! [[ $auronly ]] && existsinpacman "$package"; then
    160. 

  160. +    if ! [[ $puronly ]] && existsinpacman "$package"; then
    161. 

  161.        pacmanpackages+=("$package")
    162. 

  162. -    elif ! [[ $auronly ]] && existsinpacmangroup "$package"; then
    163. 

  163. +    elif ! [[ $puronly ]] && existsinpacmangroup "$package"; then
    164. 

  164.        pacmanpackages+=("$package")
    165. 

  165. -    elif existsinaur "$package"; then
    166. 

  166. +    elif existsinpur "$package"; then
    167. 

  167.        if finddeps "$package"; then
    168. 

  168.          # here is where dep dupes are created
    169. 

  169. -        aurpackages+=("$package")
    170. 

  170. -        aurdepends=("${aurdeps[@]}" "${aurdepends[@]}")
    171. 

  171. +        purpackages+=("$package")
    172. 

  172. +        purdepends=("${purdeps[@]}" "${purdepends[@]}")
    173. 

  173.          pacmandepends+=("${pacmandeps[@]}")
    174. 

  174.        fi
    175. 

  175.      else
    176. 

  176. @@ -370,8 +370,8 @@
    177. 

  177.      fi
    178. 

  178.    done
    179. 

  179.  
    180. 

  180. -  # Check if any aur target packages are ignored
    181. 

  181. -  for package in "${aurpackages[@]}"; do
    182. 

  182. +  # Check if any pur target packages are ignored
    183. 

  183. +  for package in "${purpackages[@]}"; do
    184. 

  184.      if isignored "$package"; then
    185. 

  185.        echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] "
    186. 

  186.        if ! [[ $noconfirm ]]; then
    187. 

  187. @@ -380,17 +380,17 @@
    188. 

  188.          echo
    189. 

  189.        fi
    190. 

  190.      fi
    191. 

  191. -    aurtargets+=("$package")
    192. 

  192. +    purtargets+=("$package")
    193. 

  193.    done
    194. 

  194.  
    195. 

  195. -  # Check if any aur dependencies are ignored
    196. 

  196. -  for package in "${aurdepends[@]}"; do
    197. 

  197. +  # Check if any pur dependencies are ignored
    198. 

  198. +  for package in "${purdepends[@]}"; do
    199. 

  199.      if isignored "$package"; then
    200. 

  200.        echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] "
    201. 

  201.        if ! [[ $noconfirm ]]; then
    202. 

  202.          if ! proceed; then
    203. 

  203.            echo "Unresolved dependency \`$package'"
    204. 

  204. -          unset aurtargets
    205. 

  205. +          unset purtargets
    206. 

  206.            break
    207. 

  207.          fi
    208. 

  208.        else
    209. 

  209. @@ -403,33 +403,33 @@
    210. 

  210.    if [[ $pacmanpackages ]]; then
    211. 

  211.      runasroot $PACMAN "${PACOPTS[@]}" -S -- "${pacmanpackages[@]}"
    212. 

  212.    fi
    213. 

  213. -  if [[ -z $aurtargets ]]; then
    214. 

  214. +  if [[ -z $purtargets ]]; then
    215. 

  215.      exit
    216. 

  216.    fi
    217. 

  217. -  # Test if aurpackages are already installed; echo warning if so
    218. 

  218. -  for pkg in "${aurtargets[@]}"; do
    219. 

  219. +  # Test if purpackages are already installed; echo warning if so
    220. 

  220. +  for pkg in "${purtargets[@]}"; do
    221. 

  221.      if existsinlocal "$pkg"; then
    222. 

  222.        localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg" | cut -d ' ' -f 2)"
    223. 

  223. -      if ! aurversionisnewer "$pkg" "$localversion"; then
    224. 

  224. +      if ! purversionisnewer "$pkg" "$localversion"; then
    225. 

  225.          echo -e "${COLOR6}warning:$ENDCOLOR $pkg-$localversion is up to date -- reinstalling"
    226. 

  226.        fi
    227. 

  227.      fi
    228. 

  228.    done
    229. 

  229.  
    230. 

  230.    # Echo warning if packages are out of date
    231. 

  231. -  for pkg in "${aurtargets[@]}" "${aurdepends[@]}"; do
    232. 

  232. +  for pkg in "${purtargets[@]}" "${purdepends[@]}"; do
    233. 

  233.      if isoutofdate "$pkg"; then
    234. 

  234.        echo -e "${COLOR6}warning:$ENDCOLOR $pkg is flagged out of date"
    235. 

  235.      fi
    236. 

  236.    done
    237. 

  237.      
    238. 

  238. -  # Prompt for aur packages and their dependencies
    239. 

  239. +  # Prompt for pur packages and their dependencies
    240. 

  240.    echo
    241. 

  241. -  if [[ $aurdepends ]]; then
    242. 

  242. -    num="$((${#aurdepends[@]}+${#aurtargets[@]}))"
    243. 

  243. -    echo -e "${COLOR6}Aur Targets    ($num):${ENDCOLOR} ${aurdepends[@]} ${aurtargets[@]}"
    244. 

  244. +  if [[ $purdepends ]]; then
    245. 

  245. +    num="$((${#purdepends[@]}+${#purtargets[@]}))"
    246. 

  246. +    echo -e "${COLOR6}Pur Targets    ($num):${ENDCOLOR} ${purdepends[@]} ${purtargets[@]}"
    247. 

  247.    else 
    248. 

  248. -    echo -e "${COLOR6}Aur Targets    ($((${#aurtargets[@]}))):${ENDCOLOR} ${aurtargets[@]}"
    249. 

  249. +    echo -e "${COLOR6}Pur Targets    ($((${#purtargets[@]}))):${ENDCOLOR} ${purtargets[@]}"
    250. 

  250.    fi
    251. 

  251.    if [[ $pacmandepends ]]; then
    252. 

  252.      IFS=$'\n' read -rd '' -a pacmandepends < \
    253. 

  253. @@ -450,18 +450,18 @@
    254. 

  254.      runasroot $PACMAN --noconfirm --asdeps -S -- "${pacmandepends[@]}" || err "Installation failed."
    255. 

  255.    fi 
    256. 

  256.  
    257. 

  257. -  # Install aur dependencies
    258. 

  258. -  if [[ $aurdepends ]]; then
    259. 

  259. -    for dep in "${aurdepends[@]}"; do
    260. 

  260. -      aurinstall "$dep" "dependency"
    261. 

  261. +  # Install pur dependencies
    262. 

  262. +  if [[ $purdepends ]]; then
    263. 

  263. +    for dep in "${purdepends[@]}"; do
    264. 

  264. +      purinstall "$dep" "dependency"
    265. 

  265.      done
    266. 

  266.    fi 
    267. 

  267.  
    268. 

  268. -  # Install the aur packages
    269. 

  269. -  for package in "${aurtargets[@]}"; do
    270. 

  270. -    scrapeaurdeps "$package"
    271. 

  271. +  # Install the pur packages
    272. 

  272. +  for package in "${purtargets[@]}"; do
    273. 

  273. +    scrapepurdeps "$package"
    274. 

  274.      if pacman -T "${dependencies[@]}" &>/dev/null; then
    275. 

  275. -      aurinstall "$package" "explicit"
    276. 

  276. +      purinstall "$package" "explicit"
    277. 

  277.      else
    278. 

  278.        echo "Dependencies for \`$package' are not met, not building..."
    279. 

  279.      fi
    280. 

  280. @@ -469,16 +469,16 @@
    281. 

  281.  }
    282. 

  282.  
    283. 

  283.  run_quick_check() {
    284. 

  284. -  bigurl="https://aur.archlinux.org/rpc.php?type=multiinfo"
    285. 

  285. +  bigurl="https://pur.parabola.nu/rpc.php?type=multiinfo"
    286. 

  286.    for p in $(pacman -Qqm); do
    287. 

  287.      bigurl="$bigurl&arg\[\]=$p"
    288. 

  288.    done
    289. 

  289. -  parsed_aur="$(curl -s "$bigurl" | \
    290. 

  290. +  parsed_pur="$(curl -s "$bigurl" | \
    291. 

  291.      jshon -e results -a -e Name -u -p -e Version -u | \
    292. 

  292.      sed 's/^$/-/' | paste -s -d '\t\n' | sort)"
    293. 

  293.    packages="$(expac -Q '%n\t%v' | sort)"
    294. 

  294. -  comm -23 <(echo "$parsed_aur") <(echo "$packages") | cut -f 1
    295. 

  295. -  if [[ $auronly == 1 ]]; then
    296. 

  296. +  comm -23 <(echo "$parsed_pur") <(echo "$packages") | cut -f 1
    297. 

  297. +  if [[ $puronly == 1 ]]; then
    298. 

  298.      return
    299. 

  299.    fi
    300. 

  300.    # see https://mailman.archlinux.org/pipermail/pacman-dev/2011-October/014673.html
    301. 

  301. @@ -527,7 +527,7 @@
    302. 

  302.      '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;;
    303. 

  303.      '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");;
    304. 

  304.      '--noedit') noedit='1' ;;
    305. 

  305. -    '--auronly') auronly='1' ;;
    306. 

  306. +    '--puronly') puronly='1' ;;
    307. 

  307.      '--quickcheck') quickcheck='1' ;;
    308. 

  308.      '--devel') devel='1' ;;
    309. 

  309.      '--skipinteg') MAKEPKGOPTS="--skipinteg" ;;
    310. 

  310. @@ -560,12 +560,12 @@
    311. 

  311.    getignoredpackages
    312. 

  312.    sourcemakepkgconf
    313. 

  313.    # Pacman update
    314. 

  314. -  if ! [[ $auronly ]]; then
    315. 

  315. +  if ! [[ $puronly ]]; then
    316. 

  316.      runasroot $PACMAN "${PACOPTS[@]}" "$pacmanarg"
    317. 

  317.    fi
    318. 

  318.  
    319. 

  319. -  # Aur update
    320. 

  320. -  echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}"
    321. 

  321. +  # Pur update
    322. 

  322. +  echo -e "${COLOR5}:: ${COLOR1}Synchronizing pur database...${ENDCOLOR}"
    323. 

  323.    IFS=$'\n' read -rd '' -a packages < <(pacman -Qm)
    324. 

  324.    newpackages=()
    325. 

  325.    checkignores=()
    326. 

  326. @@ -574,7 +574,7 @@
    327. 

  327.  
    328. 

  328.    if [[ $devel ]]; then
    329. 

  329.      for ((i=0; i<$total; i++)); do 
    330. 

  330. -      aurbar "$((i+1))" "$total" "$bartype"
    331. 

  331. +      purbar "$((i+1))" "$total" "$bartype"
    332. 

  332.        pkg="${packages[i]%% *}"
    333. 

  333.        if isignored "$pkg"; then
    334. 

  334.          checkignores+=("${packages[i]}")
    335. 

  335. @@ -603,7 +603,7 @@
    336. 

  336.      done
    337. 

  337.    else
    338. 

  338.      for ((i=0; i<$total; i++)); do 
    339. 

  339. -      aurbar "$((i+1))" "$total" "$bartype"
    340. 

  340. +      purbar "$((i+1))" "$total" "$bartype"
    341. 

  341.        pkg="${packages[i]%% *}"
    342. 

  342.        rpcinfo "$pkg" &
    343. 

  343.        nap
    344. 

  344. @@ -614,25 +614,25 @@
    345. 

  345.        ver="${packages[i]##* }"
    346. 

  346.        if isignored "$pkg"; then
    347. 

  347.          checkignores+=("${packages[i]}")
    348. 

  348. -      elif aurversionisnewer "$pkg" "$ver"; then
    349. 

  349. +      elif purversionisnewer "$pkg" "$ver"; then
    350. 

  350.          newpackages+=("$pkg")
    351. 

  351.      fi
    352. 

  352.      done
    353. 

  353.    fi
    354. 

  354.    echo
    355. 

  355.  
    356. 

  356. -  echo -e "${COLOR5}:: ${COLOR1}Starting full aur upgrade...${ENDCOLOR}"
    357. 

  357. +  echo -e "${COLOR5}:: ${COLOR1}Starting full pur upgrade...${ENDCOLOR}"
    358. 

  358.  
    359. 

  359.    # Check and output ignored package update info
    360. 

  360.    for package in "${checkignores[@]}"; do
    361. 

  361. -    if aurversionisnewer "${package%% *}" "${package##* }"; then
    362. 

  362. -      echo -e "${COLOR6}warning:${ENDCOLOR} ${package%% *}: ignoring package upgrade (${package##* } => $aurversion)"
    363. 

  363. +    if purversionisnewer "${package%% *}" "${package##* }"; then
    364. 

  364. +      echo -e "${COLOR6}warning:${ENDCOLOR} ${package%% *}: ignoring package upgrade (${package##* } => $purversion)"
    365. 

  365.      fi
    366. 

  366.    done
    367. 

  367.  
    368. 

  368.    # Now for the installation part
    369. 

  369.    if [[ $newpackages ]]; then
    370. 

  370. -    auronly='1'
    371. 

  371. +    puronly='1'
    372. 

  372.      installhandling "${newpackages[@]}"
    373. 

  373.    fi
    374. 

  374.    echo " local database is up to date"
    375. 

  375. @@ -641,10 +641,10 @@
    376. 

  376.  # Download (-G) handling
    377. 

  377.  if [[ $option = download ]]; then
    378. 

  378.    for package in "${packageargs[@]}"; do
    379. 

  379. -    if existsinaur "$package"; then
    380. 

  380. +    if existsinpur "$package"; then
    381. 

  381.        pkglist+=("$package")
    382. 

  382.      else
    383. 

  383. -      err "Package \`$package' does not exist on aur."
    384. 

  384. +      err "Package \`$package' does not exist on pur."
    385. 

  385.      fi
    386. 

  386.    done
    387. 

  387.  
    388. 

  388. @@ -658,7 +658,7 @@
    389. 

  389.  # Search (-Ss) handling
    390. 

  390.  if [[ $option = search || $option = searchinstall ]]; then
    391. 

  391.    # Pacman searching 
    392. 

  392. -  if ! [[ $auronly ]]; then
    393. 

  393. +  if ! [[ $puronly ]]; then
    394. 

  394.      if [[ $quiet ]]; then
    395. 

  395.        results="$(pacman -Ssq -- "${packageargs[@]}")"
    396. 

  396.      else
    397. 

  397. @@ -677,7 +677,7 @@
    398. 

  398.      pactotal=0
    399. 

  399.    fi
    400. 

  400.  
    401. 

  401. -  # Aur searching and tmpfile preparation
    402. 

  402. +  # Pur searching and tmpfile preparation
    403. 

  403.    for package in "${packageargs[@]}"; do
    404. 

  404.      curl -LfGs --data-urlencode "arg=$package" "$RPCURL=search" | \
    405. 

  405.      jshon -Q -e results -a -e Name -u -p -e Version -u -p -e NumVotes -u -p -e Description -u | \
    406. 

  406. @@ -692,24 +692,24 @@
    407. 

  407.    sed -i '/^$/d' "$tmpdir/search.results"
    408. 

  408.  
    409. 

  409.    # Prepare tmp file and arrays
    410. 

  410. -  IFS=$'\n' read -rd '' -a aurname < <(cut -f 1 "$tmpdir/search.results")
    411. 

  411. -  aurtotal="${#aurname[@]}"
    412. 

  412. -  alltotal="$(($pactotal+$aurtotal))"
    413. 

  413. +  IFS=$'\n' read -rd '' -a purname < <(cut -f 1 "$tmpdir/search.results")
    414. 

  414. +  purtotal="${#purname[@]}"
    415. 

  415. +  alltotal="$(($pactotal+$purtotal))"
    416. 

  416.    # Echo out the -Ss formatted package information
    417. 

  417.  
    418. 

  418.    IFS=$'\t\n'
    419. 

  419.    if [[ $option = search ]]; then
    420. 

  420.      if [[ $quiet ]]; then
    421. 

  421. -      printf "%s\n" ${aurname[@]}
    422. 

  422. +      printf "%s\n" ${purname[@]}
    423. 

  423.      elif [[ -s "$tmpdir/search.results" ]]; then
    424. 

  424. -      printf "${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n    %s\n" $(cat "$tmpdir/search.results")
    425. 

  425. +      printf "${COLOR3}pur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n    %s\n" $(cat "$tmpdir/search.results")
    426. 

  426.      fi
    427. 

  427.    else
    428. 

  428.      # interactive
    429. 

  429.      if [[ $quiet ]]; then
    430. 

  430.        nl -v ${pactotal:-0} -w 1 -s ' ' <(cut -f 1 "$tmpdir/search.results")
    431. 

  431.      elif [[ -s "$tmpdir/search.results" ]]; then
    432. 

  432. -      printf "%d ${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n    %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results")
    433. 

  433. +      printf "%d ${COLOR3}pur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n    %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results")
    434. 

  434.      fi
    435. 

  435.    fi | fmt -"$_WIDTH" -s
    436. 

  436.    unset IFS
    437. 

  437. @@ -717,7 +717,7 @@
    438. 

  438.    # Prompt and install selected numbers
    439. 

  439.    if [[ $option = searchinstall ]]; then
    440. 

  440.      pkglist=()
    441. 

  441. -    allpackages=( "${pacname[@]}" "${aurname[@]}" )
    442. 

  442. +    allpackages=( "${pacname[@]}" "${purname[@]}" )
    443. 

  443.  
    444. 

  444.      # Exit if there are no matches
    445. 

  445.      [[ $allpackages ]] || exit
    446. 

  446. @@ -754,7 +754,7 @@
    447. 

  447.    # Pacman info check
    448. 

  448.    sourcemakepkgconf
    449. 

  449.    for package in "${packageargs[@]}"; do
    450. 

  450. -    if ! [[ $auronly ]] && existsinpacman "$package"; then
    451. 

  451. +    if ! [[ $puronly ]] && existsinpacman "$package"; then
    452. 

  452.        results="$(pacman -Si -- "$package")"
    453. 

  453.        results="$(sed -r "s|^(Repository[^:]*:)(.*)$|\1$S${COLOR3}\2$S${ENDCOLOR}|" <<< "$results")"
    454. 

  454.        results="$(sed -r "s|^(Name[^:]*:)(.*)$|\1$S${COLOR1}\2$S${ENDCOLOR}|" <<< "$results")"
    455. 

  455. @@ -763,14 +763,14 @@
    456. 

  456.        results="$(sed -r "s|^[^ ][^:]*:|$S${COLOR1}&$S${ENDCOLOR}|" <<< "$results")"
    457. 

  457.        echo -e "$results"
    458. 

  458.        exit
    459. 

  459. -    else # Check to see if it is in the aur
    460. 

  460. +    else # Check to see if it is in the pur
    461. 

  461.        pkginfo "$package" "$preview"
    462. 

  462.        [[ -s "$tmpdir/$package.PKGBUILD" ]] || err "${COLOR7}error:${ENDCOLOR} package '$package' was not found"
    463. 

  463.        . "$tmpdir/$package.PKGBUILD"
    464. 

  464.  
    465. 

  465.        # Echo out the -Si formatted package information
    466. 

  466.        # Retrieve each element in order and echo them immediately
    467. 

  467. -      echo -e "${COLOR1}Repository     : ${COLOR3}aur"
    468. 

  468. +      echo -e "${COLOR1}Repository     : ${COLOR3}pur"
    469. 

  469.        echo -e "${COLOR1}Name           : $pkgname"
    470. 

  470.        echo -e "${COLOR1}Version        : ${COLOR2}$pkgver-$pkgrel"
    471. 

  471.        echo -e "${COLOR1}URL            : ${COLOR4}$url"
    472. 

  472. diff -Nur a/packer.8 b/packer.8
    473. 

  473. --- a/packer.8	2015-08-28 16:26:27.881641047 -0300
    474. 

  474. +++ b/packer.8	2015-08-28 16:28:32.232156389 -0300
    475. 

  475. @@ -19,13 +19,13 @@
    476. 

  476.  .\" * MAIN CONTENT STARTS HERE *
    477. 

  477.  .\" -----------------------------------------------------------------
    478. 

  478.  .SH "NAME"
    479. 

  479. -packer \- package manager utility for pacman repositories and the AUR
    480. 

  480. +packer \- package manager utility for pacman repositories and the PUR
    481. 

  481.  .SH "SYNOPSIS"
    482. 

  482.  .sp
    483. 

  483.  \fIpacman\fR <operation> [options] [packages]
    484. 

  484.  .SH "DESCRIPTION"
    485. 

  485.  .sp
    486. 

  486. -Packer is a bash wrapper for pacman and the AUR\&. It was designed to be a simple and very fast replacement for the basic functionality of yaourt\&. It allows you to install, update, search, and show information for any package in the main repositories and in the AUR\&. For other commands, such as removing packages, use pacman\&.
    487. 

  487. +Packer is a bash wrapper for pacman and the PUR\&. It was designed to be a simple and very fast replacement for the basic functionality of yaourt\&. It allows you to install, update, search, and show information for any package in the main repositories and in the PUR\&. For other commands, such as removing packages, use pacman\&.
    488. 

  488.  .SH "OPERATIONS"
    489. 

  489.  .PP
    490. 

  490.  \fB\-Ss\fR
    491. 

  491. @@ -50,7 +50,7 @@
    492. 

  492.  .PP
    493. 

  493.  \fB\-G\fR
    494. 

  494.  .RS 4
    495. 

  495. -Download and extract AUR package tarballs, but don\(cqt install anything\&.
    496. 

  496. +Download and extract PUR package tarballs, but don\(cqt install anything\&.
    497. 

  497.  .RE
    498. 

  498.  .PP
    499. 

  499.  \fB\-h\fR
    500. 

  500. @@ -79,9 +79,9 @@
    501. 

  501.  Check for updates and exit\&.
    502. 

  502.  .RE
    503. 

  503.  .PP
    504. 

  504. -\fB\-\-auronly\fR
    505. 

  505. +\fB\-\-puronly\fR
    506. 

  506.  .RS 4
    507. 

  507. -Only perform commands for the AUR\&.
    508. 

  508. +Only perform commands for the PUR\&.
    509. 

  509.  .RE
    510. 

  510.  .PP
    511. 

  511.  \fB\-\-devel\fR
    512. 

  512. @@ -91,7 +91,7 @@
    513. 

  513.  .PP
    514. 

  514.  \fB\-\-skipinteg\fR
    515. 

  515.  .RS 4
    516. 

  516. -Skip the integrity check by ignoring AUR package MD5 sums\&.
    517. 

  517. +Skip the integrity check by ignoring PUR package MD5 sums\&.
    518. 

  518.  .RE
    519. 

  519.  .PP
    520. 

  520.  \fB\-\-preview\fR
    521. 

  521. @@ -123,8 +123,8 @@
    522. 

  522.  .sp -1
    523. 

  523.  .IP \(bu 2.3
    524. 

  524.  .\}
    525. 

  525. -Update only AUR packages:
    526. 

  526. -packer \-Syu \-\-auronly
    527. 

  527. +Update only PUR packages:
    528. 

  528. +packer \-Syu \-\-puronly
    529. 

  529.  .RE
    530. 

  530.  .sp
    531. 

  531.  .RS 4
    532. 

  532.